From 395ada4ec81a5e49ac86316abf6db6d5e31ab85c Mon Sep 17 00:00:00 2001
From: Edouard DUPIN <yui.heero@gmail.com>
Date: Mon, 6 Mar 2017 22:03:34 +0100
Subject: [PATCH] [DEBUG] correct the display of the search composer

---
 data/GUI-Search.xml              | 52 +++++++++++++++-----------------
 sources/appl/Gui/MainWindows.cpp | 15 +++++----
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/data/GUI-Search.xml b/data/GUI-Search.xml
index 49f7599..2fc11a8 100644
--- a/data/GUI-Search.xml
+++ b/data/GUI-Search.xml
@@ -1,28 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<composer expand="true,false" fill="true,false">
-	<sizer mode="hori" expand="true,false" fill="true" lock="true">
-		<button name="SEARCH:close">
-			<image src="THEME:GUI:Remove.edf" fill="true" size="7,7mm" distance-field="true"/>
-		</button>
-		<entry name="SEARCH:search-entry" expand="true" fill="true"/>
-		<button name="SEARCH:search">
-			<image src="THEME:GUI:Search.edf" fill="true" size="7,7mm" distance-field="true"/>
-		</button>
-		<entry name="SEARCH:replace-entry" expand="true" fill="true"/>
-		<button name="SEARCH:replace">
-			<image src="THEME:GUI:Replace.edf" fill="true" size="7,7mm" distance-field="true"/>
-		</button>
-		<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"/>
-		</button>
-		<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"/>
-		</button>
-		<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:Down.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/>
-		</button>
-	</sizer>
-</composer>
\ No newline at end of file
+<sizer mode="hori" expand="true,false" fill="true" lock="true">
+	<button name="SEARCH:close">
+		<image src="THEME:GUI:Remove.edf" fill="true" size="7,7mm" distance-field="true"/>
+	</button>
+	<entry name="SEARCH:search-entry" expand="true" fill="true"/>
+	<button name="SEARCH:search">
+		<image src="THEME:GUI:Search.edf" fill="true" size="7,7mm" distance-field="true"/>
+	</button>
+	<entry name="SEARCH:replace-entry" expand="true" fill="true"/>
+	<button name="SEARCH:replace">
+		<image src="THEME:GUI:Replace.edf" fill="true" size="7,7mm" distance-field="true"/>
+	</button>
+	<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"/>
+	</button>
+	<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"/>
+	</button>
+	<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:Down.edf" fill="true" size="7,7mm" hover="_T(Close search bar)" distance-field="true"/>
+	</button>
+</sizer>
\ No newline at end of file
diff --git a/sources/appl/Gui/MainWindows.cpp b/sources/appl/Gui/MainWindows.cpp
index a2b6bf2..3ea2334 100644
--- a/sources/appl/Gui/MainWindows.cpp
+++ b/sources/appl/Gui/MainWindows.cpp
@@ -162,6 +162,8 @@ void MainWindows::init() {
 				
 				// search area:
 				m_widgetSearch = appl::widget::Search::create();
+				m_widgetSearch->propertyExpand.set(bvec2(true,false));
+				m_widgetSearch->propertyFill.set(bvec2(true,true));
 				mySizerVert2->subWidgetAdd(m_widgetSearch);
 			
 		mySizerHori = ewol::widget::Sizer::create();
@@ -174,22 +176,23 @@ void MainWindows::init() {
 			mySizerHori->subWidgetAdd(myMenu);
 			int32_t idMenuFile = myMenu->addTitle("_T{File}");
 				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{Close}",        "THEME:GUI:Close.edf", "menu:close");
 				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 As ...}",  "", "menu:save-as");
-				myMenu->addSpacer();
+				myMenu->addSpacer(idMenuFile);
 				myMenu->add(idMenuFile, "_T{Properties}",   "THEME:GUI:Parameter.edf", "menu:property");
-				myMenu->addSpacer();
+				myMenu->addSpacer(idMenuFile);
 				myMenu->add(idMenuFile, "_T{Exit}",   "", "menu:exit");
 			int32_t idMenuEdit = myMenu->addTitle("_T{Edit}");
 				myMenu->add(idMenuEdit, "_T{Goto line ...}","", "menu:goto-line");
+			myMenu->addSpacer();
 			int32_t idMenuSearch = myMenu->addTitle("_T{Search}");
 				myMenu->add(idMenuSearch, "_T{Search}",         "THEME:GUI:Search.edf", "menu:search");
 				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 (next)}",    "", "menu:find:next");
 				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{Shape square}",         "", "menu:shape:shape/square/");
 				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->addSpacer();
+				myMenu->addSpacer(idMenugDisplay);
 				myMenu->add(idMenugDisplay, "_T{Split}", "", "menu:split:enable");
 				myMenu->add(idMenugDisplay, "_T{Unsplit}", "", "menu:split:disable");
 				myMenu->add(idMenugDisplay, "_T{Vertical}", "", "menu:split:vert");