From 9e652d5604721334148b86b6e74a69b95972da7d Mon Sep 17 00:00:00 2001 From: Matthias Kupfer Date: Sun, 23 Aug 2009 13:39:47 +0000 Subject: [PATCH] - 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. svn path=/trunk/; revision=42881 --- reactos/base/shell/explorer/taskbar/desktopbar.cpp | 5 +++-- reactos/base/shell/explorer/taskbar/quicklaunch.cpp | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/reactos/base/shell/explorer/taskbar/desktopbar.cpp b/reactos/base/shell/explorer/taskbar/desktopbar.cpp index 08e42d758f4..8c4c25f58e2 100644 --- a/reactos/base/shell/explorer/taskbar/desktopbar.cpp +++ b/reactos/base/shell/explorer/taskbar/desktopbar.cpp @@ -147,13 +147,13 @@ LRESULT DesktopBar::Init(LPCREATESTRUCT pcs) 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 @@ LRESULT DesktopBar::Init(LPCREATESTRUCT pcs) 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 diff --git a/reactos/base/shell/explorer/taskbar/quicklaunch.cpp b/reactos/base/shell/explorer/taskbar/quicklaunch.cpp index ee973c764bd..90bc5d8fc82 100644 --- a/reactos/base/shell/explorer/taskbar/quicklaunch.cpp +++ b/reactos/base/shell/explorer/taskbar/quicklaunch.cpp @@ -154,8 +154,6 @@ void QuickLaunchBar::AddShortcuts() } 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)