From fe51307bd26eb777d5e406e5de3e6c349e36ec42 Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Mon, 19 Sep 2005 15:15:22 +0000 Subject: [PATCH] Fix the taskbar button resizing to account for button spacing. svn path=/trunk/; revision=17933 --- reactos/subsys/system/explorer/taskbar/taskbar.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/reactos/subsys/system/explorer/taskbar/taskbar.cpp b/reactos/subsys/system/explorer/taskbar/taskbar.cpp index fe8da761075..8908178df14 100644 --- a/reactos/subsys/system/explorer/taskbar/taskbar.cpp +++ b/reactos/subsys/system/explorer/taskbar/taskbar.cpp @@ -136,6 +136,17 @@ LRESULT TaskBar::Init(LPCREATESTRUCT pcs) //SendMessage(_htoolbar, TB_SETPADDING, 0, MAKELPARAM(8,8)); metrics.cbSize = sizeof(TBMETRICS); + metrics.dwMask = TBMF_PAD | TBMF_BARPAD | TBMF_BUTTONSPACING; + SendMessage(_htoolbar, TB_GETMETRICS, 0, (LPARAM)&metrics); + { + FILE *f = fopen("test.txt", "w"); + fprintf(f, "Pad: %d, %d\nBarPad: %d, %d\nBS: %d, %d\n", + metrics.cxPad, metrics.cyPad, + metrics.cxBarPad, metrics.cyBarPad, + metrics.cxButtonSpacing, metrics.cyButtonSpacing); + fclose(f); + } + metrics.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING; metrics.cxBarPad = 0; metrics.cyBarPad = 0; @@ -562,7 +573,7 @@ void TaskBar::ResizeButtons() if (btns > 0) { int bar_width = ClientRect(_hwnd).right; - int btn_width = bar_width / btns; + int btn_width = (bar_width / btns) - 3; if (btn_width < TASKBUTTONWIDTH_MIN) btn_width = TASKBUTTONWIDTH_MIN;