HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] correct the display of the search composer

Browse Source
This commit is contained in:
Edouard DUPIN 2017-03-06 22:03:34 +01:00
parent f273f809c2
commit 395ada4ec8
2 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
data/GUI-Search.xml
View File

@ -1,28 +1,26 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<composer expand="true,false" fill="true,false"> <sizer mode="hori" expand="true,false" fill="true" lock="true">
<sizer mode="hori" expand="true,false" fill="true" lock="true"> <button name="SEARCH:close">
<button name="SEARCH:close"> <image src="THEME:GUI:Remove.edf" fill="true" size="7,7mm" distance-field="true"/>
<image src="THEME:GUI:Remove.edf" fill="true" size="7,7mm" distance-field="true"/> </button>
</button> <entry name="SEARCH:search-entry" expand="true" fill="true"/>
<entry name="SEARCH:search-entry" expand="true" fill="true"/> <button name="SEARCH:search">
<button name="SEARCH:search"> <image src="THEME:GUI:Search.edf" fill="true" size="7,7mm" distance-field="true"/>
<image src="THEME:GUI:Search.edf" fill="true" size="7,7mm" distance-field="true"/> </button>
</button> <entry name="SEARCH:replace-entry" expand="true" fill="true"/>
<entry name="SEARCH:replace-entry" expand="true" fill="true"/> <button name="SEARCH:replace">
<button name="SEARCH:replace"> <image src="THEME:GUI:Replace.edf" fill="true" size="7,7mm" distance-field="true"/>
<image src="THEME:GUI:Replace.edf" fill="true" size="7,7mm" distance-field="true"/> </button>
</button> <button name="SEARCH:case" toggle="true">
<button name="SEARCH:case" toggle="true"> <image src="THEME:GUI:CaseSensitive.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/>
<image src="THEME:GUI:CaseSensitive.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/> <image src="THEME:GUI:CaseSensitive.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/>
<image src="THEME:GUI:CaseSensitive.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/> </button>
</button> <button name="SEARCH:wrap" toggle="true">
<button name="SEARCH:wrap" toggle="true"> <image src="THEME:GUI:WrapAround.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/>
<image src="THEME:GUI:WrapAround.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/> <image src="THEME:GUI:WrapAround.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/>
<image src="THEME:GUI:WrapAround.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/> </button>
</button> <button name="SEARCH:up-down" toggle="true">
<button name="SEARCH:up-down" toggle="true"> <image src="THEME:GUI:Up.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/>
<image src="THEME:GUI:Up.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/> <image src="THEME:GUI:Down.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/>
<image src="THEME:GUI:Down.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/> </button>
</button> </sizer>
</sizer>
</composer>

15
sources/appl/Gui/MainWindows.cpp
View File

@ -162,6 +162,8 @@ void MainWindows::init() {
// search area: // search area:
m_widgetSearch = appl::widget::Search::create(); m_widgetSearch = appl::widget::Search::create();
m_widgetSearch->propertyExpand.set(bvec2(true,false));
m_widgetSearch->propertyFill.set(bvec2(true,true));
mySizerVert2->subWidgetAdd(m_widgetSearch); mySizerVert2->subWidgetAdd(m_widgetSearch);
mySizerHori = ewol::widget::Sizer::create(); mySizerHori = ewol::widget::Sizer::create();
@ -174,22 +176,23 @@ void MainWindows::init() {
mySizerHori->subWidgetAdd(myMenu); mySizerHori->subWidgetAdd(myMenu);
int32_t idMenuFile = myMenu->addTitle("_T{File}"); int32_t idMenuFile = myMenu->addTitle("_T{File}");
myMenu->add(idMenuFile, "_T{New}", "", "menu:new"); myMenu->add(idMenuFile, "_T{New}", "", "menu:new");
myMenu->addSpacer(); myMenu->addSpacer(idMenuFile);
myMenu->add(idMenuFile, "_T{Open}", "THEME:GUI:Load.edf", "menu:open"); myMenu->add(idMenuFile, "_T{Open}", "THEME:GUI:Load.edf", "menu:open");
myMenu->add(idMenuFile, "_T{Close}", "THEME:GUI:Close.edf", "menu:close"); myMenu->add(idMenuFile, "_T{Close}", "THEME:GUI:Close.edf", "menu:close");
myMenu->add(idMenuFile, "_T{Close (all)}", "", "menu:close-all"); myMenu->add(idMenuFile, "_T{Close (all)}", "", "menu:close-all");
myMenu->add(idMenuFile, "_T{Save}", "THEME:GUI:Save.edf", "menu:save"); myMenu->add(idMenuFile, "_T{Save}", "THEME:GUI:Save.edf", "menu:save");
myMenu->add(idMenuFile, "_T{Save As ...}", "", "menu:save-as"); myMenu->add(idMenuFile, "_T{Save As ...}", "", "menu:save-as");
myMenu->addSpacer(); myMenu->addSpacer(idMenuFile);
myMenu->add(idMenuFile, "_T{Properties}", "THEME:GUI:Parameter.edf", "menu:property"); myMenu->add(idMenuFile, "_T{Properties}", "THEME:GUI:Parameter.edf", "menu:property");
myMenu->addSpacer(); myMenu->addSpacer(idMenuFile);
myMenu->add(idMenuFile, "_T{Exit}", "", "menu:exit"); myMenu->add(idMenuFile, "_T{Exit}", "", "menu:exit");
int32_t idMenuEdit = myMenu->addTitle("_T{Edit}"); int32_t idMenuEdit = myMenu->addTitle("_T{Edit}");
myMenu->add(idMenuEdit, "_T{Goto line ...}","", "menu:goto-line"); myMenu->add(idMenuEdit, "_T{Goto line ...}","", "menu:goto-line");
myMenu->addSpacer();
int32_t idMenuSearch = myMenu->addTitle("_T{Search}"); int32_t idMenuSearch = myMenu->addTitle("_T{Search}");
myMenu->add(idMenuSearch, "_T{Search}", "THEME:GUI:Search.edf", "menu:search"); myMenu->add(idMenuSearch, "_T{Search}", "THEME:GUI:Search.edf", "menu:search");
myMenu->add(idMenuSearch, "_T{Replace}", "THEME:GUI:Replace.edf", "menu:replace"); myMenu->add(idMenuSearch, "_T{Replace}", "THEME:GUI:Replace.edf", "menu:replace");
myMenu->addSpacer(); myMenu->addSpacer(idMenuSearch);
myMenu->add(idMenuSearch, "_T{Find (previous)}","", "menu:find:previous"); myMenu->add(idMenuSearch, "_T{Find (previous)}","", "menu:find:previous");
myMenu->add(idMenuSearch, "_T{Find (next)}", "", "menu:find:next"); myMenu->add(idMenuSearch, "_T{Find (next)}", "", "menu:find:next");
myMenu->add(idMenuSearch, "_T{Find (all)}", "", "menu:find:all"); myMenu->add(idMenuSearch, "_T{Find (all)}", "", "menu:find:all");
@ -199,9 +202,9 @@ void MainWindows::init() {
myMenu->add(idMenugDisplay, "_T{Color White}", "", "menu:color:color/white/"); myMenu->add(idMenugDisplay, "_T{Color White}", "", "menu:color:color/white/");
myMenu->add(idMenugDisplay, "_T{Shape square}", "", "menu:shape:shape/square/"); myMenu->add(idMenugDisplay, "_T{Shape square}", "", "menu:shape:shape/square/");
myMenu->add(idMenugDisplay, "_T{Shape round}", "", "menu:shape:shape/round/"); myMenu->add(idMenugDisplay, "_T{Shape round}", "", "menu:shape:shape/round/");
myMenu->addSpacer(); myMenu->addSpacer(idMenugDisplay);
myMenu->add(idMenugDisplay, "_T{Reload openGl Shader}", "", "menu:reloadShape"); myMenu->add(idMenugDisplay, "_T{Reload openGl Shader}", "", "menu:reloadShape");
myMenu->addSpacer(); myMenu->addSpacer(idMenugDisplay);
myMenu->add(idMenugDisplay, "_T{Split}", "", "menu:split:enable"); myMenu->add(idMenugDisplay, "_T{Split}", "", "menu:split:enable");
myMenu->add(idMenugDisplay, "_T{Unsplit}", "", "menu:split:disable"); myMenu->add(idMenugDisplay, "_T{Unsplit}", "", "menu:split:disable");
myMenu->add(idMenugDisplay, "_T{Vertical}", "", "menu:split:vert"); myMenu->add(idMenugDisplay, "_T{Vertical}", "", "menu:split:vert");