Commit in reactos/subsys/system/explorer on MAIN
Makefile+3-21.23 -> 1.24
Makefile.MinGW+3-21.15 -> 1.16
explorer.dsp+18-181.49 -> 1.50
taskbar/desktopbar.cpp+13-51.30 -> 1.31
       /desktopbar.h+11.21 -> 1.22
       /taskbar.cpp+3-11.40 -> 1.41
       /taskbar.h-21.24 -> 1.25
+41-30
7 modified files
adjust start button to text size
reactos/subsys/system/explorer
Makefile 1.23 -> 1.24
diff -u -r1.23 -r1.24
--- Makefile	22 Feb 2004 18:46:45 -0000	1.23
+++ Makefile	12 Mar 2004 21:12:27 -0000	1.24
@@ -103,7 +103,8 @@

 	settings.o \
 	i386-stub-win32.o
 

-LIBS = gdi32 comctl32 ole32 uuid wsock32 oleaut32

+LIBS = gdi32 comctl32 ole32 uuid
+DELAYIMPORTS = oleaut32 wsock32

 
 .PHONY: all depends implib clean install dist bootcd depends
 

@@ -128,7 +129,7 @@

 	$(CD_PREFIX)updatebuildno
 
 $(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX)

-	$(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS))

+	$(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS))

 
 explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico
 	$(RC) $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc
reactos/subsys/system/explorer
Makefile.MinGW 1.15 -> 1.16
diff -u -r1.15 -r1.16
--- Makefile.MinGW	9 Feb 2004 22:36:13 -0000	1.15
+++ Makefile.MinGW	12 Mar 2004 21:12:27 -0000	1.16
@@ -72,12 +72,13 @@

 	settings.o \
 	i386-stub-win32.o
 

-LIBS = gdi32 comctl32 ole32 uuid wsock32 oleaut32

+LIBS = gdi32 comctl32 ole32 uuid
+DELAYIMPORTS = oleaut32 wsock32

 
 all: $(TARGET)
 
 $(TARGET): $(OBJECTS) $(PROGRAM)$(RES_SUFFIX)

-	$(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS))

+	$(LINK) $(LFLAGS) -o $@ $^ $(addprefix -l,$(LIBS)) $(addprefix -l,$(DELAYIMPORTS))

 
 explorer$(RES_SUFFIX): $(PROGRAM)_intres.rc res/*.bmp res/*.ico
 	windres $(RCFLAGS) -o $@ $(PROGRAM)_intres.rc
reactos/subsys/system/explorer
explorer.dsp 1.49 -> 1.50
diff -u -r1.49 -r1.50
--- explorer.dsp	28 Feb 2004 16:41:55 -0000	1.49
+++ explorer.dsp	12 Mar 2004 21:12:27 -0000	1.50
@@ -57,8 +57,8 @@

 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /machine:I386
-# SUBTRACT LINK32 /pdb:none /force

+# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /delayload:oleaut32.dll /delayload:wsock32.dll
+# SUBTRACT LINK32 /pdb:none

 
 !ELSEIF  "$(CFG)" == "explorer - Win32 Debug"
 

@@ -82,8 +82,8 @@

 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 kernel32.lib shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /force

+# ADD LINK32 kernel32.lib shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll
+# SUBTRACT LINK32 /pdb:none

 
 !ELSEIF  "$(CFG)" == "explorer - Win32 Debug Release"
 

@@ -108,8 +108,8 @@

 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386
-# SUBTRACT LINK32 /pdb:none /force

+# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /delayload:oleaut32.dll /delayload:wsock32.dll
+# SUBTRACT LINK32 /pdb:none

 
 !ELSEIF  "$(CFG)" == "explorer - Win32 Unicode Release"
 

@@ -134,8 +134,8 @@

 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /machine:I386

-# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /machine:I386
-# SUBTRACT LINK32 /pdb:none /force

+# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /delayload:oleaut32.dll /delayload:wsock32.dll
+# SUBTRACT LINK32 /pdb:none

 
 !ELSEIF  "$(CFG)" == "explorer - Win32 Unicode Debug"
 

@@ -160,8 +160,8 @@

 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept

-# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /force

+# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll
+# SUBTRACT LINK32 /pdb:none

 
 !ELSEIF  "$(CFG)" == "explorer - Win32 _NO_COMUTIL"
 

@@ -187,8 +187,8 @@

 LINK32=link.exe
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib shell32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /force

+# ADD LINK32 shell32.lib comctl32.lib gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll
+# SUBTRACT LINK32 /pdb:none

 
 !ELSEIF  "$(CFG)" == "explorer - Win32"
 

@@ -214,8 +214,8 @@

 LINK32=link.exe
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib comctl32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Win32/wexplorer.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /force

+# ADD LINK32 gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /debug /machine:I386 /out:"Win32/wexplorer.exe" /pdbtype:sept /delayload:oleaut32.dll
+# SUBTRACT LINK32 /pdb:none

 
 !ELSEIF  "$(CFG)" == "explorer - Win32 WineRelease"
 

@@ -241,8 +241,8 @@

 LINK32=link.exe
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # SUBTRACT BASE LINK32 /pdb:none

-# ADD LINK32 gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /incremental:no /machine:I386 /out:"WineRelease/wexplorer.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /debug /force

+# ADD LINK32 gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /incremental:no /machine:I386 /out:"WineRelease/wexplorer.exe" /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll /delayload:wsock32.dll
+# SUBTRACT LINK32 /pdb:none

 
 !ELSEIF  "$(CFG)" == "explorer - Win32 WineDll"
 

@@ -268,8 +268,8 @@

 LINK32=link.exe
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /machine:I386 /pdbtype:sept
 # SUBTRACT BASE LINK32 /pdb:none /debug

-# ADD LINK32 gdi32.lib user32.lib advapi32.lib ole32.lib /nologo /subsystem:windows /machine:I386 /out:"WineDll/wexplorer.exe" /pdbtype:sept
-# SUBTRACT LINK32 /pdb:none /debug /force

+# ADD LINK32 gdi32.lib user32.lib advapi32.lib ole32.lib delayimp.lib /nologo /subsystem:windows /machine:I386 /out:"WineDll/wexplorer.exe" /pdbtype:sept /delayload:oleaut32.dll /delayload:wsock32.dll
+# SUBTRACT LINK32 /pdb:none

 
 !ENDIF
reactos/subsys/system/explorer/taskbar
desktopbar.cpp 1.30 -> 1.31
diff -u -r1.30 -r1.31
--- desktopbar.cpp	29 Feb 2004 15:06:34 -0000	1.30
+++ desktopbar.cpp	12 Mar 2004 21:12:27 -0000	1.31
@@ -89,7 +89,15 @@

 		return 1;
 
 	 // create start button

-	new PictureButton(Button(_hwnd, ResString(IDS_START), 2, 2, STARTBUTTON_WIDTH, DESKTOPBARBAR_HEIGHT-8, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW),

+	ResString start_str(IDS_START);
+	WindowCanvas canvas(_hwnd);
+	RECT rect = {0, 0};
+	DrawText(canvas, start_str, -1, &rect, DT_SINGLELINE|DT_CALCRECT);
+	int start_btn_width = rect.right+16+8;
+
+	_taskbar_pos = start_btn_width + 6;
+
+	new PictureButton(Button(_hwnd, start_str, 2, 2, start_btn_width, DESKTOPBARBAR_HEIGHT-8, IDC_START, WS_VISIBLE|WS_CHILD|BS_OWNERDRAW),

 						SmallIcon(IDI_STARTMENU)/*, GetStockBrush(WHITE_BRUSH)*/);
 
 	 // create task bar

@@ -137,7 +145,7 @@

 	rbBand.hwndChild = _hwndTaskBar;
 	rbBand.cxMinChild = 0;
 	rbBand.cyMinChild = ClientRect(_hwndTaskBar).bottom + 2;

-	rbBand.cx = 200;	//pcs->cx-TASKBAR_LEFT-quicklaunch_width-(notifyarea_width+1);

+	rbBand.cx = 200;	//pcs->cx-_taskbar_pos-quicklaunch_width-(notifyarea_width+1);

 	SendMessage(_hwndrebar, RB_INSERTBAND, (WPARAM)-1, (LPARAM)&rbBand);
 #endif
 

@@ -248,13 +256,13 @@

 	HDWP hdwp = BeginDeferWindowPos(3);
 
 	if (_hwndrebar)

-		DeferWindowPos(hdwp, _hwndrebar, 0, TASKBAR_LEFT, 0, cx-TASKBAR_LEFT-(notifyarea_width+1), cy, SWP_NOZORDER|SWP_NOACTIVATE);

+		DeferWindowPos(hdwp, _hwndrebar, 0, _taskbar_pos, 0, cx-_taskbar_pos-(notifyarea_width+1), cy, SWP_NOZORDER|SWP_NOACTIVATE);

 	else {
 		if (_hwndQuickLaunch)

-			DeferWindowPos(hdwp, _hwndQuickLaunch, 0, TASKBAR_LEFT, 1, quicklaunch_width, cy-2, SWP_NOZORDER|SWP_NOACTIVATE);

+			DeferWindowPos(hdwp, _hwndQuickLaunch, 0, _taskbar_pos, 1, quicklaunch_width, cy-2, SWP_NOZORDER|SWP_NOACTIVATE);

 
 		if (_hwndTaskBar)

-			DeferWindowPos(hdwp, _hwndTaskBar, 0, TASKBAR_LEFT+quicklaunch_width, 0, cx-TASKBAR_LEFT-quicklaunch_width-(notifyarea_width+1), cy, SWP_NOZORDER|SWP_NOACTIVATE);

+			DeferWindowPos(hdwp, _hwndTaskBar, 0, _taskbar_pos+quicklaunch_width, 0, cx-_taskbar_pos-quicklaunch_width-(notifyarea_width+1), cy, SWP_NOZORDER|SWP_NOACTIVATE);

 	}
 
 	if (_hwndNotify)
reactos/subsys/system/explorer/taskbar
desktopbar.h 1.21 -> 1.22
diff -u -r1.21 -r1.22
--- desktopbar.h	25 Feb 2004 22:56:49 -0000	1.21
+++ desktopbar.h	12 Mar 2004 21:12:27 -0000	1.22
@@ -78,6 +78,7 @@

 
 	int		WM_TASKBARCREATED;
 	RECT	_work_area_org;

+	int		_taskbar_pos;

 
 	LRESULT	Init(LPCREATESTRUCT pcs);
 	LRESULT	WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam);
reactos/subsys/system/explorer/taskbar
taskbar.cpp 1.40 -> 1.41
diff -u -r1.40 -r1.41
--- taskbar.cpp	28 Feb 2004 16:41:55 -0000	1.40
+++ taskbar.cpp	12 Mar 2004 21:12:27 -0000	1.41
@@ -71,10 +71,12 @@

 {
 	ClientRect clnt(hwndParent);
 

+	int taskbar_pos = 80;	// This start position will be adjusted in DesktopBar::Resize().
+

 	return Window::Create(WINDOW_CREATOR(TaskBar), 0,
 							BtnWindowClass(CLASSNAME_TASKBAR), TITLE_TASKBAR,
 							WS_CHILD|WS_VISIBLE | CCS_TOP|CCS_NODIVIDER|CCS_NORESIZE,

-							TASKBAR_LEFT, 0, clnt.right-TASKBAR_LEFT-(NOTIFYAREA_WIDTH_DEF+1), clnt.bottom, hwndParent);

+							taskbar_pos, 0, clnt.right-taskbar_pos-(NOTIFYAREA_WIDTH_DEF+1), clnt.bottom, hwndParent);

 }
 
 LRESULT TaskBar::Init(LPCREATESTRUCT pcs)
reactos/subsys/system/explorer/taskbar
taskbar.h 1.24 -> 1.25
diff -u -r1.24 -r1.25
--- taskbar.h	28 Feb 2004 13:45:33 -0000	1.24
+++ taskbar.h	12 Mar 2004 21:12:28 -0000	1.25
@@ -34,8 +34,6 @@

 
 #define	IDC_FIRST_APP	0x2000
 

-#define	STARTBUTTON_WIDTH		60
-#define	TASKBAR_LEFT			70

 //#define TASKBAR_AT_TOP
 
 #define	TASKBUTTONWIDTH_MIN		38
CVSspam 0.2.8