[jimtabor] 65491: [Explorer] - Restore the original four virtual window support. See CORE-6151.

Author: jimtabor
Date: Wed Nov 26 15:29:51 2014
New Revision: 65491

URL: http://svn.reactos.org/svn/reactos?rev=65491&view=rev
Log:
[Explorer]
- Restore the original four virtual window support. See CORE-6151.

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

Modified: trunk/reactos/base/shell/explorer/globals.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/globals...
==============================================================================
--- trunk/reactos/base/shell/explorer/globals.h	[iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/globals.h	[iso-8859-1] Wed Nov 26 15:29:51 2014
@@ -235,7 +235,7 @@
 #endif

-#define	DESKTOP_COUNT	2
+#define	DESKTOP_COUNT	4

struct Desktops : public vector<DesktopRef>
 {

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] Wed Nov 26 15:29:51 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);