Author: akhaldi Date: Wed Nov 26 18:02:55 2014 New Revision: 65494
URL: http://svn.reactos.org/svn/reactos?rev=65494&view=rev Log: * Addendum to r65483.
Added: branches/shell-experiments/base/shell/explorer/ - copied from r65493, branches/shell-experiments/base/shell/explorer-old/ Removed: branches/shell-experiments/base/shell/explorer-old/ Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.cpp branches/shell-experiments/base/shell/explorer/globals.h branches/shell-experiments/base/shell/explorer/taskbar/desktopbar.cpp
Modified: branches/shell-experiments/base/shell/explorer-new/traywnd.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/exp... ============================================================================== --- branches/shell-experiments/base/shell/explorer-new/traywnd.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer-new/traywnd.cpp [iso-8859-1] Wed Nov 26 18:02:55 2014 @@ -1853,11 +1853,6 @@ default: partId = TBP_BACKGROUNDBOTTOM; break; - } - - if (IsThemeBackgroundPartiallyTransparent(TaskbarTheme, partId, 0)) - { - DrawThemeParentBackground(m_hWnd, hdc, &rect); }
DrawThemeBackground(TaskbarTheme, hdc, partId, 0, &rect, 0);
Modified: branches/shell-experiments/base/shell/explorer/globals.h URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/exp... ============================================================================== --- branches/shell-experiments/base/shell/explorer/globals.h [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer/globals.h [iso-8859-1] Wed Nov 26 18:02:55 2014 @@ -235,7 +235,7 @@ #endif
-#define DESKTOP_COUNT 2 +#define DESKTOP_COUNT 4
struct Desktops : public vector<DesktopRef> {
Modified: branches/shell-experiments/base/shell/explorer/taskbar/desktopbar.cpp URL: http://svn.reactos.org/svn/reactos/branches/shell-experiments/base/shell/exp... ============================================================================== --- branches/shell-experiments/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original) +++ branches/shell-experiments/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Wed Nov 26 18:02:55 2014 @@ -145,8 +145,8 @@ TCHAR QuickLaunchBand[] = _T("Quicklaunch"); rbBand.lpText = QuickLaunchBand; rbBand.hwndChild = _hwndQuickLaunch; - rbBand.cx = 100; - rbBand.cxMinChild = 100; + rbBand.cx = 150; + rbBand.cxMinChild = 150; rbBand.wID = IDW_QUICKLAUNCHBAR; SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand);
@@ -451,7 +451,9 @@ break;
case ID_SWITCH_DESKTOP_1: - case ID_SWITCH_DESKTOP_1+1: { + case ID_SWITCH_DESKTOP_1+1: + case ID_SWITCH_DESKTOP_1+2: + case ID_SWITCH_DESKTOP_1+3: { int desktop_idx = id - ID_SWITCH_DESKTOP_1;
g_Globals._desktops.SwitchToDesktop(desktop_idx);