linuxdcpp-team team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2474
committer: poy <poy@xxxxxxxxxx>
branch nick: trunk
timestamp: Tue 2011-03-29 20:19:38 +0200
message:
  fix the file list search bar
modified:
  dwt/include/dwt/widgets/Splitter.h
  dwt/src/widgets/Splitter.cpp
  win32/DirectoryListingFrame.cpp


--
lp:dcplusplus
https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk

Your team Dcplusplus-team is subscribed to branch lp:dcplusplus.
To unsubscribe from this branch go to https://code.launchpad.net/~dcplusplus-team/dcplusplus/trunk/+edit-subscription

=== modified file 'dwt/include/dwt/widgets/Splitter.h'
--- dwt/include/dwt/widgets/Splitter.h	2011-03-15 19:52:17 +0000
+++ dwt/include/dwt/widgets/Splitter.h	2011-03-29 18:19:38 +0000
@@ -32,12 +32,8 @@
 #ifndef DWT_SPLITTER_H
 #define DWT_SPLITTER_H
 
-#include "Container.h"
-#include "ToolTip.h"
-#include <dwt/Texts.h>
-#include <dwt/dwt_vsstyle.h>
-#include "../Theme.h"
-#include "../resources/Brush.h"
+#include "Control.h"
+#include <dwt/Theme.h>
 
 namespace dwt {
 
@@ -81,12 +77,8 @@
 	typedef std::function<void(double)> OnMoveFunction;
 	void onMove(OnMoveFunction func);
 
-	virtual void layout() {
-		// TODO rect = r;
-		BaseType::layout();
-	}
-
 	virtual Point getPreferredSize() { return horizontal ? Point(0, thickness()) : Point(thickness(), 0); }
+
 protected:
 	explicit Splitter(Widget* parent);
 
@@ -101,8 +93,6 @@
 	bool moving;
 	bool horizontal;
 
-	Rectangle rect;
-
 	OnMoveFunction onMoveFunc;
 
 	void handlePainting(PaintCanvas& canvas);

=== modified file 'dwt/src/widgets/Splitter.cpp'
--- dwt/src/widgets/Splitter.cpp	2011-03-02 21:33:22 +0000
+++ dwt/src/widgets/Splitter.cpp	2011-03-29 18:19:38 +0000
@@ -31,6 +31,12 @@
 
 #include <dwt/widgets/Splitter.h>
 
+#include <dwt/dwt_vsstyle.h>
+#include <dwt/Texts.h>
+#include <dwt/WidgetCreator.h>
+#include <dwt/resources/Brush.h>
+#include <dwt/widgets/ToolTip.h>
+
 namespace dwt {
 
 void Splitter::create(const Seed& cs) {

=== modified file 'win32/DirectoryListingFrame.cpp'
--- win32/DirectoryListingFrame.cpp	2011-03-27 10:50:56 +0000
+++ win32/DirectoryListingFrame.cpp	2011-03-29 18:19:38 +0000
@@ -448,7 +448,7 @@
 		grid->row(0).mode = GridInfo::AUTO;
 		searchBox->setFocus();
 	}
-	layout();
+	grid->layout();
 }
 
 void DirectoryListingFrame::refreshTree(const tstring& root) {