diff --git a/sources/appl/MainWindows.cpp b/sources/appl/MainWindows.cpp index 5628d17..7a24fce 100644 --- a/sources/appl/MainWindows.cpp +++ b/sources/appl/MainWindows.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +//#include static const char * l_eventChangeTheme = "event-change-theme"; @@ -88,7 +88,7 @@ MainWindows::MainWindows(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(3); + mySpacer->SetMinSize(vec2(3,3)); mySpacer->SetColor(0x000000FF); m_sizerVert->SubWidgetAdd(mySpacer); } @@ -174,13 +174,14 @@ void MainWindows::OnReceiveMessage(ewol::EObject * CallerObject, const char * ev } if (m_testName!=NULL) { m_testName->SetLabel("TestImage"); }; break; - case 5: + /*case 5: m_subWidget = (ewol::Widget*)new TestScene(); if (NULL != m_subWidget) { m_sizerVert->SubWidgetAdd(m_subWidget); } if (m_testName!=NULL) { m_testName->SetLabel("TestScene"); }; break; + */ } } diff --git a/sources/appl/TestButton.cpp b/sources/appl/TestButton.cpp index fa7eeee..426c08a 100644 --- a/sources/appl/TestButton.cpp +++ b/sources/appl/TestButton.cpp @@ -120,7 +120,7 @@ TestButton::TestButton(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0xFF000080); SubWidgetAdd(mySpacer); } @@ -136,7 +136,7 @@ TestButton::TestButton(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FF0080); mySizerHori->SubWidgetAdd(mySpacer); } @@ -159,7 +159,7 @@ TestButton::TestButton(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x0000FF80); mySizerHori->SubWidgetAdd(mySpacer); } @@ -168,7 +168,7 @@ TestButton::TestButton(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FFFF80); SubWidgetAdd(mySpacer); } diff --git a/sources/appl/TestButtonColor.cpp b/sources/appl/TestButtonColor.cpp index b37f875..d3dffaf 100644 --- a/sources/appl/TestButtonColor.cpp +++ b/sources/appl/TestButtonColor.cpp @@ -85,7 +85,7 @@ TestButtonColor::TestButtonColor(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0xFF000080); SubWidgetAdd(mySpacer); } @@ -101,7 +101,7 @@ TestButtonColor::TestButtonColor(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FF0080); mySizerHori->SubWidgetAdd(mySpacer); } @@ -118,7 +118,7 @@ TestButtonColor::TestButtonColor(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x0000FF80); mySizerHori->SubWidgetAdd(mySpacer); } @@ -127,7 +127,7 @@ TestButtonColor::TestButtonColor(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FFFF80); SubWidgetAdd(mySpacer); } diff --git a/sources/appl/TestImage.cpp b/sources/appl/TestImage.cpp index 2fd3f5d..fc81b07 100644 --- a/sources/appl/TestImage.cpp +++ b/sources/appl/TestImage.cpp @@ -100,7 +100,7 @@ TestImage::TestImage(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0xFF000080); SubWidgetAdd(mySpacer); } @@ -116,7 +116,7 @@ TestImage::TestImage(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FF0080); mySizerHori->SubWidgetAdd(mySpacer); } @@ -133,7 +133,7 @@ TestImage::TestImage(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x0000FF80); mySizerHori->SubWidgetAdd(mySpacer); } @@ -142,7 +142,7 @@ TestImage::TestImage(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FFFF80); SubWidgetAdd(mySpacer); } diff --git a/sources/appl/TestLabel.cpp b/sources/appl/TestLabel.cpp index e7785ae..05abe46 100644 --- a/sources/appl/TestLabel.cpp +++ b/sources/appl/TestLabel.cpp @@ -101,7 +101,7 @@ TestLabel::TestLabel(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0xFF000080); SubWidgetAdd(mySpacer); } @@ -117,7 +117,7 @@ TestLabel::TestLabel(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FF0080); mySizerHori->SubWidgetAdd(mySpacer); } @@ -134,7 +134,7 @@ TestLabel::TestLabel(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x0000FF80); mySizerHori->SubWidgetAdd(mySpacer); } @@ -143,7 +143,7 @@ TestLabel::TestLabel(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FFFF80); SubWidgetAdd(mySpacer); } diff --git a/sources/appl/TestScene.cpp b/sources/appl/TestScene.cpp index eeb7d11..264f771 100644 --- a/sources/appl/TestScene.cpp +++ b/sources/appl/TestScene.cpp @@ -142,7 +142,7 @@ TestScene::TestScene(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0xFF000080); SubWidgetAdd(mySpacer); } @@ -158,7 +158,7 @@ TestScene::TestScene(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FF0080); mySizerHori->SubWidgetAdd(mySpacer); } @@ -174,7 +174,7 @@ TestScene::TestScene(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(false,true)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x0000FF80); mySizerHori->SubWidgetAdd(mySpacer); } @@ -183,7 +183,7 @@ TestScene::TestScene(void) : if (NULL != mySpacer) { mySpacer->SetExpand(bvec2(false,false)); mySpacer->SetFill(bvec2(true,false)); - mySpacer->SetSize(10); + mySpacer->SetMinSize(vec2(10,10)); mySpacer->SetColor(0x00FFFF80); SubWidgetAdd(mySpacer); }