Commit in reactos/subsys/system/explorer on MAIN
Jamfile+1-11.9 -> 1.10
Makefile+1-11.24 -> 1.25
taskbar/taskbar.cpp+10-31.41 -> 1.42
       /taskbar.h+11.25 -> 1.26
       /traynotify.cpp+1-11.38 -> 1.39
+14-6
5 modified files
resize taskbar buttons on WM_SIZE
reactos/subsys/system/explorer
Jamfile 1.9 -> 1.10
diff -u -r1.9 -r1.10
--- Jamfile	7 Feb 2004 15:00:28 -0000	1.9
+++ Jamfile	14 Mar 2004 18:51:35 -0000	1.10
@@ -41,7 +41,7 @@

 	dialogs/searchprogram.cpp
 	dialogs/settings.cpp
 	i386-stub-win32.c

- :	<define>WIN32 <define>_WIN32_IE=0x0501 <define>_WIN32_WINNT=0x0501

+ :	<define>WIN32 <define>_WIN32_IE=0x0600 <define>_WIN32_WINNT=0x0501

 	<cxxflags>-I$(INCLUDE)
 #nur f�r GCC:	<cxxflags>-fexceptions <cxxflags>-Wall
 	<find-shared-library>gdi32
reactos/subsys/system/explorer
Makefile 1.24 -> 1.25
diff -u -r1.24 -r1.25
--- Makefile	12 Mar 2004 21:12:27 -0000	1.24
+++ Makefile	14 Mar 2004 18:51:35 -0000	1.25
@@ -43,7 +43,7 @@

 UNICODE = 1
 endif
 

-CFLAGS	= -DWIN32 -D_ROS_ -D_WIN32_IE=0x0501 -D_WIN32_WINNT=0x0501 -fexceptions -Wall -I$(W32API_PATH)/include

+CFLAGS	= -DWIN32 -D_ROS_ -D_WIN32_IE=0x0600 -D_WIN32_WINNT=0x0501 -fexceptions -Wall -I$(W32API_PATH)/include

 RCFLAGS	= -DWIN32 -D_ROS_ -D__WINDRES__ --include-dir $(W32API_PATH)/include
 LFLAGS	= -Wl,--subsystem,windows
reactos/subsys/system/explorer/taskbar
taskbar.cpp 1.41 -> 1.42
diff -u -r1.41 -r1.42
--- taskbar.cpp	12 Mar 2004 21:12:27 -0000	1.41
+++ taskbar.cpp	14 Mar 2004 18:51:35 -0000	1.42
@@ -58,6 +58,7 @@

 TaskBar::TaskBar(HWND hwnd)
  :	super(hwnd)
 {

+	_last_btn_width = 0;

 }
 
 TaskBar::~TaskBar()

@@ -86,13 +87,14 @@

 
 	_htoolbar = CreateToolbarEx(_hwnd,
 								WS_CHILD|WS_VISIBLE|WS_CLIPSIBLINGS|WS_CLIPCHILDREN|

-								CCS_TOP|CCS_NODIVIDER | TBSTYLE_LIST|TBSTYLE_TOOLTIPS|TBSTYLE_WRAPABLE,

+								CCS_TOP|CCS_NODIVIDER | TBSTYLE_LIST|TBSTYLE_TOOLTIPS|TBSTYLE_WRAPABLE,//|TBSTYLE_AUTOSIZE

 								IDW_TASKTOOLBAR, 0, 0, 0, NULL, 0, 0, 0, 16, 16, sizeof(TBBUTTON));
 
 	SendMessage(_htoolbar, TB_SETBUTTONWIDTH, 0, MAKELONG(TASKBUTTONWIDTH_MAX,TASKBUTTONWIDTH_MAX));
 	//SendMessage(_htoolbar, TB_SETEXTENDEDSTYLE, 0, TBSTYLE_EX_MIXEDBUTTONS);
 	//SendMessage(_htoolbar, TB_SETDRAWTEXTFLAGS, DT_CENTER|DT_VCENTER, DT_CENTER|DT_VCENTER);
 	//SetWindowFont(_htoolbar, GetStockFont(ANSI_VAR_FONT), FALSE);

+	//SendMessage(_htoolbar, TB_SETPADDING, 0, MAKELPARAM(8,8));

 
 	_next_id = IDC_FIRST_APP;
 

@@ -110,6 +112,7 @@

 	switch(nmsg) {
 	  case WM_SIZE:
 		SendMessage(_htoolbar, WM_SIZE, 0, 0);

+		ResizeButtons();

 		break;
 
 	  case WM_TIMER:

@@ -463,7 +466,11 @@

 		else if (btn_width > TASKBUTTONWIDTH_MAX)
 			btn_width = TASKBUTTONWIDTH_MAX;
 

-		SendMessage(_htoolbar, TB_SETBUTTONWIDTH, 0, MAKELONG(btn_width,btn_width));
-		SendMessage(_htoolbar, TB_AUTOSIZE, 0, 0);

+		if (btn_width != _last_btn_width) {
+			_last_btn_width = btn_width;
+
+			SendMessage(_htoolbar, TB_SETBUTTONWIDTH, 0, MAKELONG(btn_width,btn_width));
+			SendMessage(_htoolbar, TB_AUTOSIZE, 0, 0);
+		}

 	}
 }
reactos/subsys/system/explorer/taskbar
taskbar.h 1.25 -> 1.26
diff -u -r1.25 -r1.26
--- taskbar.h	12 Mar 2004 21:12:28 -0000	1.25
+++ taskbar.h	14 Mar 2004 18:51:35 -0000	1.26
@@ -84,6 +84,7 @@

 	TaskBarMap	_map;
 	int			_next_id;
 	WindowHandle _last_foreground_wnd;

+	int		_last_btn_width;

 
 	LRESULT	Init(LPCREATESTRUCT pcs);
 	LRESULT	WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam);
reactos/subsys/system/explorer/taskbar
traynotify.cpp 1.38 -> 1.39
diff -u -r1.38 -r1.39
--- traynotify.cpp	14 Mar 2004 16:39:28 -0000	1.38
+++ traynotify.cpp	14 Mar 2004 18:51:35 -0000	1.39
@@ -108,7 +108,7 @@

 	_clock_width = 0;
 	_show_hidden = false;
 

-	_tooltip.add(_hwnd, _hwnd);

+	_tooltip.add(_hwnd, _hwnd);	///@todo use one area for each icon

 }
 
 LRESULT NotifyArea::Init(LPCREATESTRUCT pcs)
CVSspam 0.2.8