From 8f320e07e383896a64f8900ec6eb7638b3cd8703 Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Tue, 3 Apr 2018 21:41:43 +0200 Subject: [PATCH] [DEV] bigger list size and some xml update --- data/languages/cmake/highlight.xml | 40 ++++++++++++++++++++++++++---- data/languages/cpp/highlight.xml | 2 +- data/languages/php/highlight.xml | 6 ++--- sources/appl/Gui/BufferView.cpp | 11 ++++++++ sources/appl/Gui/BufferView.hpp | 1 + sources/appl/Gui/MainWindows.cpp | 1 + 6 files changed, 52 insertions(+), 9 deletions(-) diff --git a/data/languages/cmake/highlight.xml b/data/languages/cmake/highlight.xml index b93ad2a..0e2fccf 100644 --- a/data/languages/cmake/highlight.xml +++ b/data/languages/cmake/highlight.xml @@ -2,22 +2,22 @@ CMakeLists.txt CMakeCache.txt + (cmake) commentDoxygen ##.*$ - - - SYNTAX_ERROR - #[ \t]TODO[ \t]*:(.|\\[\\\n])*$ + doxyparse comment #(.|\\[\\\n])*$ + TODO doubleQuoteText - "(.|\\[\\"])*?"$ + "(.|\\[\\"])*" + parameters @@ -50,4 +50,34 @@ \@(\w|_)+[ \t]*\( + + + doxygen-key-known + (\@|\\)[\t ]*(addindex|addtogroup|anchor|arg|attention|author|authors|a|brief|bug|b|callgraph|category|cite|class|code|cond|copybrief|copydetails|copydoc|copyright|date|def|defgroup|deprecated|details|diafile|dir|docbookonly|dontinclude|dot|dotfile|else|elseif|em|endcode|endcond|enddocbookonly|enddot|endhtmlonly|endif|endinternal|endlatexonly|endlink|endmanonly|endmsc|endparblock|endrtfonly|endsecreflist|endverbatim|enduml|endxmlonly|enum|example|exception|extends|e|file|fn|headerfile|hidecallergraph|hidecallgraph|hideinitializer|htmlinclude|htmlonly|idlexcept|ifnot|if|image|implements|includelineno|include|ingroup|internal|invariant|interface|latexinclude|latexonly|line|link|license|li|mainpage|manonly|memberof|msc|mscfile|name|namespace|nosubgrouping|note|n|overload|package|page|paragraph|param|parblock|par|post|pre|private|privatesection|property|protected|protectedsection|protocol|public|publicsection|pure|p|refitem|ref|related|relates|relatedalso|relatesalso|remark|remarks|result|return|returns|retval|rtfonly|sa|secreflist|section|see|short|showinitializer|since|skip|skipline|snippet|startuml|struct|subpage|subsection|subsubsection|tableofcontents|test|throw|throws|todo|tparam|typedef|union|until|var|verbatim|verbinclude|version|vhdlflow|warning|weakgroup|xmlonly|xrefitem) + + + doxygen-key + (\@|\\)[\t ]*\w+ + + + doxygen-in-out + \[(in|in,out|out)\] + + + inputFunction + \@_\w+\@ + + + + + SYNTAX_ERROR + TODO[ \t]*:.*$ + + + + + inputFunction + \$\{.*\} + + diff --git a/data/languages/cpp/highlight.xml b/data/languages/cpp/highlight.xml index 0766d74..952d10a 100644 --- a/data/languages/cpp/highlight.xml +++ b/data/languages/cpp/highlight.xml @@ -43,7 +43,7 @@ commentDoxygen - //!.*$ + //(!|/).*$ doxyparse diff --git a/data/languages/php/highlight.xml b/data/languages/php/highlight.xml index c88c280..05e36d2 100644 --- a/data/languages/php/highlight.xml +++ b/data/languages/php/highlight.xml @@ -26,7 +26,7 @@ commentDoxygen - //!.*$ + //(!|/).*$ doxyparse @@ -36,11 +36,11 @@ doubleQuoteText - "(.|\\[\\"])*" + "(\\[\\"]|.)*" doubleQuoteText - '(.|\\[\\'])*' + '(\\[\\']|.)*' diff --git a/sources/appl/Gui/BufferView.cpp b/sources/appl/Gui/BufferView.cpp index 3b5ae42..fad48f1 100644 --- a/sources/appl/Gui/BufferView.cpp +++ b/sources/appl/Gui/BufferView.cpp @@ -60,6 +60,17 @@ BufferView::~BufferView() { removeAllElement(); } + +void BufferView::calculateMinMaxSize() { + /*int32_t fontId = getDefaultFontId(); + int32_t minWidth = ewol::getWidth(fontId, m_label); + int32_t minHeight = ewol::getHeight(fontId); + m_minSize.x = 3+minWidth; + m_minSize.y = 3+minHeight; + */ + m_minSize.setValue(300, 150); +} + void BufferView::removeAllElement() { m_list.clear(); } diff --git a/sources/appl/Gui/BufferView.hpp b/sources/appl/Gui/BufferView.hpp index 91a1cf8..e368382 100644 --- a/sources/appl/Gui/BufferView.hpp +++ b/sources/appl/Gui/BufferView.hpp @@ -76,5 +76,6 @@ class BufferView : public ewol::widget::List { void onCallbackNewBuffer(const etk::String& _value); void onCallbackselectNewFile(const etk::String& _value); void onCallbackBufferRemoved(const ememory::SharedPtr& _buffer); + void calculateMinMaxSize(); }; diff --git a/sources/appl/Gui/MainWindows.cpp b/sources/appl/Gui/MainWindows.cpp index c3b3d73..f688cd3 100644 --- a/sources/appl/Gui/MainWindows.cpp +++ b/sources/appl/Gui/MainWindows.cpp @@ -117,6 +117,7 @@ void MainWindows::init() { myBufferView->propertyName.set("plop 3333333"); myBufferView->propertyExpand.set(bvec2(false,true)); myBufferView->propertyFill.set(bvec2(true,true)); + //myBufferView->propertyMinSize.set(gale::Dimension(vec2(300,2), gale::distance::pixel)); mySizerHori->subWidgetAdd(myBufferView); ewol::widget::SpacerShared mySpacer = ewol::widget::Spacer::create();