[gedmurphy] 36644: - Use TBSTATE_PRESSED, our checked graphic isn't too pretty - reduce desktops to 2 to save some taskbar space - switch the icon back to the original one. It suits the tango set much better.

Author: gedmurphy
Date: Sat Oct  4 08:19:23 2008
New Revision: 36644
URL: http://svn.reactos.org/svn/reactos?rev=36644&view=rev
Log:
- Use TBSTATE_PRESSED, our checked graphic isn't too pretty
- reduce desktops to 2 to save some taskbar space
- switch the icon back to the original one. It suits the tango set much better.
Modified:
    trunk/reactos/base/shell/explorer/globals.h
    trunk/reactos/base/shell/explorer/res/startmenu.ico   (contents, props changed)
    trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp
    trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
Modified: trunk/reactos/base/shell/explorer/globals.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/global…
==============================================================================
--- trunk/reactos/base/shell/explorer/globals.h [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/globals.h [iso-8859-1] Sat Oct  4 08:19:23 2008
@@ -235,7 +235,7 @@
 #endif
-#define        DESKTOP_COUNT   4
+#define        DESKTOP_COUNT   2
 struct Desktops : public vector<DesktopRef>
 {
Modified: trunk/reactos/base/shell/explorer/res/startmenu.ico
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/res/st…
==============================================================================
Binary files - no diff available.
Propchange: trunk/reactos/base/shell/explorer/res/startmenu.ico
------------------------------------------------------------------------------
    svn:needs-lock = *
Modified: trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba…
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskbar/desktopbar.cpp [iso-8859-1] Sat Oct  4
08:19:23 2008
@@ -427,9 +427,7 @@
                break;
          case ID_SWITCH_DESKTOP_1:
-         case ID_SWITCH_DESKTOP_1+1:
-         case ID_SWITCH_DESKTOP_1+2:
-         case ID_SWITCH_DESKTOP_1+3: {
+         case ID_SWITCH_DESKTOP_1+1: {
                int desktop_idx = id - ID_SWITCH_DESKTOP_1;
                g_Globals._desktops.SwitchToDesktop(desktop_idx);
Modified: trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/taskba…
==============================================================================
--- trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] (original)
+++ trunk/reactos/base/shell/explorer/taskbar/quicklaunch.cpp [iso-8859-1] Sat Oct  4
08:19:23 2008
@@ -150,7 +150,7 @@
                SelectBitmap(hdc, hbmp_old);
-               AddButton(ID_SWITCH_DESKTOP_1+i, hbmp, FmtString(desktop_fmt, i+1), NULL,
cur_desktop==i?TBSTATE_ENABLED|TBSTATE_CHECKED:TBSTATE_ENABLED);
+               AddButton(ID_SWITCH_DESKTOP_1+i, hbmp, FmtString(desktop_fmt, i+1), NULL,
cur_desktop==i?TBSTATE_ENABLED|TBSTATE_PRESSED:TBSTATE_ENABLED);
        }
        DeleteDC(hdc);
@@ -199,7 +199,7 @@
 void QuickLaunchBar::UpdateDesktopButtons(int desktop_idx)
 {
        for(int i=0; i<DESKTOP_COUNT; ++i) {
-               TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0,
desktop_idx==i? TBSTATE_ENABLED|TBSTATE_CHECKED: TBSTATE_ENABLED};
+               TBBUTTONINFO tbi = {sizeof(TBBUTTONINFO), TBIF_STATE, 0, 0,
desktop_idx==i? TBSTATE_ENABLED|TBSTATE_PRESSED: TBSTATE_ENABLED};
                SendMessage(_hwnd, TB_SETBUTTONINFO, ID_SWITCH_DESKTOP_1+i,
(LPARAM)&tbi);
        }