[Dcplusplus-commit] SF.net SVN: dcplusplus: [917] dcplusplus/trunk

[<zou...@us...>]

Revision: 917
          http://dcplusplus.svn.sourceforge.net/dcplusplus/?rev=917&view=rev
Author:   zouzou123gen
Date:     2007-11-30 10:57:40 -0800 (Fri, 30 Nov 2007)

Log Message:
-----------
user list filter: no multiline & combobox items visible

Modified Paths:
--------------
    dcplusplus/trunk/changelog.txt
    dcplusplus/trunk/win32/HubFrame.cpp
    dcplusplus/trunk/win32/PublicHubsFrame.cpp

Modified: dcplusplus/trunk/changelog.txt
===================================================================
--- dcplusplus/trunk/changelog.txt	2007-11-30 18:30:26 UTC (rev 916)
+++ dcplusplus/trunk/changelog.txt	2007-11-30 18:57:40 UTC (rev 917)
@@ -16,6 +16,7 @@
 * Message always focused first in chats (poy)
 * Fixed filter in public hubs (thanks poy)
 * Fixed missing title changes on tab change (thanks poy)
+* Fixed user list filter (poy)
 
 -- 0.703 2007-11-08 --
 * Fixed invalid strings (thanks james ross)

Modified: dcplusplus/trunk/win32/HubFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/HubFrame.cpp	2007-11-30 18:30:26 UTC (rev 916)
+++ dcplusplus/trunk/win32/HubFrame.cpp	2007-11-30 18:57:40 UTC (rev 917)
@@ -105,7 +105,7 @@
 	
 	{
 		WidgetTextBox::Seed cs = WinUtil::Seeds::textBox;
-		cs.style = WS_CHILD | WS_VISIBLE | WS_VSCROLL | ES_AUTOHSCROLL | ES_AUTOVSCROLL | ES_MULTILINE;
+		cs.style = WS_CHILD | WS_VISIBLE | ES_AUTOHSCROLL;
 		filter = createTextBox(cs);
 		addWidget(filter);
 		filter->onKeyUp(std::tr1::bind(&HubFrame::handleFilterKey, this, _1));
@@ -118,7 +118,7 @@
 		for(int j=0; j<COLUMN_LAST; j++) {
 			filterType->addValue(TSTRING_I(columnNames[j]));
 		}
-		filterType->addValue(CTSTRING(ANY));
+		filterType->addValue(TSTRING(ANY));
 		filterType->setSelectedIndex(COLUMN_LAST);
 		filterType->onSelectionChanged(std::tr1::bind(&HubFrame::updateUserList, this, (UserInfo*)0));
 	}
@@ -206,6 +206,8 @@
 	int xfilter = showUsers->getChecked() ? std::min(r.size.x / 4, 200l) : 0;
 	SmartWin::Rectangle rm(0, r.size.y - ymessage, r.size.x - xfilter, ymessage);
 	message->setBounds(rm);
+
+	r.size.y -= rm.size.y + border;
 	
 	rm.pos.x += rm.size.x + border;
 	rm.size.x = showUsers->getChecked() ? xfilter * 2 / 3 - border : 0;
@@ -213,9 +215,8 @@
 	
 	rm.pos.x += rm.size.x + border;
 	rm.size.x = showUsers->getChecked() ? xfilter / 3 - border : 0;
+	rm.size.y += 140;
 	filterType->setBounds(rm);
-	
-	r.size.y -= rm.size.y + border;
 
 	bool checked = showUsers->getChecked();
 	if(checked && !paned->getSecond()) {

Modified: dcplusplus/trunk/win32/PublicHubsFrame.cpp
===================================================================
--- dcplusplus/trunk/win32/PublicHubsFrame.cpp	2007-11-30 18:30:26 UTC (rev 916)
+++ dcplusplus/trunk/win32/PublicHubsFrame.cpp	2007-11-30 18:57:40 UTC (rev 917)
@@ -157,9 +157,9 @@
 
 		//populate the filter list with the column names
 		for(int j=0; j<COLUMN_LAST; j++) {
-			filterSel->addValue(CTSTRING_I(columnNames[j]));
+			filterSel->addValue(TSTRING_I(columnNames[j]));
 		}
-		filterSel->addValue(CTSTRING(ANY));
+		filterSel->addValue(TSTRING(ANY));
 		filterSel->setSelectedIndex(COLUMN_LAST);
 		filterSel->onSelectionChanged(std::tr1::bind(&PublicHubsFrame::updateList, this));
 	}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.