merge with trunk

(bzr r853.5.8)

2 files changed, 6 insertions, 2 deletions

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8272f6248..250379ad3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -75,6 +75,8 @@ add_executable (test-unit
 
 add_executable (test-panel
 TestPanel.cpp
+ ../src/PanelStyle.cpp
+ ../src/PanelStyle.h
 ../src/PanelView.cpp
 ../src/PanelView.h
 ../src/PanelIndicatorObjectView.cpp
@@ -83,6 +85,8 @@ add_executable (test-panel
 ../src/PanelIndicatorObjectEntryView.h
	../src/PanelTitlebarGrabAreaView.h
	../src/PanelTitlebarGrabAreaView.cpp
+ ../src/PanelTray.cpp
+ ../src/PanelTray.h
 ../src/IndicatorObjectFactory.h
 ../src/IndicatorObjectProxy.h
 ../src/IndicatorObjectEntryProxy.h
diff --git a/tests/TestPanel.cpp b/tests/TestPanel.cpp
index 98be4284a..7e3cd1c07 100644
--- a/tests/TestPanel.cpp
+++ b/tests/TestPanel.cpp
@@ -33,8 +33,8 @@ void ThreadWidgetInit(nux::NThread* thread, void* InitData)
 nux::VLayout *layout = new nux::VLayout(TEXT(""), NUX_TRACKER_LOCATION);
 PanelView *view = new PanelView ();
 
- view->SetMinMaxSize(1024, 24);
- layout->AddView(view, 1, nux::eCenter, nux::eFix);
+ //view->SetMinMaxSize(1024, 24);
+ layout->AddView(view, 1, nux::eCenter, nux::eFull);
 layout->SetContentDistribution(nux::eStackCenter);
 
 nux::GetGraphicsThread()->SetLayout (layout);