[mkupfer] 42881: - Remove tailing separator in explorer quicklaunch area. - Fix some values for rebarband. - See issue #3771 for details. - TODO: fix rebar (comctl32) itself, because it's not working properly.

Author: mkupfer
Date: Sun Aug 23 15:39:47 2009
New Revision: 42881

URL: http://svn.reactos.org/svn/reactos?rev=42881&view=rev
Log:
- Remove tailing separator in explorer quicklaunch area.
- Fix some values for rebarband.
- See issue #3771 for details.
- TODO: fix rebar (comctl32) itself, because it's not working properly.

Modified:
    trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp
    trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp

Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar...
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sun Aug 23 15:39:47 2009
@@ -147,13 +147,13 @@
    rbBand.cyMaxChild = (ULONG)-1;
    rbBand.cyMinChild = REBARBAND_HEIGHT;
    rbBand.cyIntegral = REBARBAND_HEIGHT + 3;	//@@ OK?
-	rbBand.cxMinChild = rbBand.cyIntegral * 3;
    rbBand.fStyle = RBBS_VARIABLEHEIGHT|RBBS_GRIPPERALWAYS|RBBS_HIDETITLE;

TCHAR QuickLaunchBand[] = _T("Quicklaunch");
    rbBand.lpText = QuickLaunchBand;
    rbBand.hwndChild = _hwndQuickLaunch;
-	rbBand.cx = 120;
+	rbBand.cx = 100;
+	rbBand.cxMinChild = 100;
    rbBand.wID = IDW_QUICKLAUNCHBAR;
    SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand);

@@ -161,6 +161,7 @@
    rbBand.lpText = TaskbarBand;
    rbBand.hwndChild = _hwndTaskBar;
    rbBand.cx = 200;	//pcs->cx-_taskbar_pos-quicklaunch_width-(notifyarea_width+1);
+	rbBand.cxMinChild = 50;
    rbBand.wID = IDW_TASKTOOLBAR;
    SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand);
 #endif

Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskbar...
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Sun Aug 23 15:39:47 2009
@@ -154,8 +154,6 @@
    }
    DeleteDC(hdc);

-	SendMessage(_hwnd, TB_INSERTBUTTON, INT_MAX, (LPARAM)&sep);
-
    for(Entry*entry=_dir->_down; entry; entry=entry->_next) {
    	 // hide files like "desktop.ini"
    	if (entry->_data.dwFileAttributes & FILE_ATTRIBUTE_HIDDEN)