diff options
| -rw-r--r-- | plugins/Scriver/src/chat/window.cpp | 3 | ||||
| -rw-r--r-- | plugins/Scriver/src/msgdialog.cpp | 3 | ||||
| -rw-r--r-- | plugins/Scriver/src/utils.cpp | 2 | ||||
| -rw-r--r-- | src/core/stdmsg/src/chat_window.cpp | 9 | ||||
| -rw-r--r-- | src/core/stdmsg/src/msgdialog.cpp | 5 |
5 files changed, 8 insertions, 14 deletions
diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp index ce1168ceb6..06a8dce233 100644 --- a/plugins/Scriver/src/chat/window.cpp +++ b/plugins/Scriver/src/chat/window.cpp @@ -950,8 +950,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR if (!cbd->m_bChatButton)
continue;
- int width = (cbd->m_dwArrowCID) ? 34 : 22;
- HWND hwndButton = CreateWindowEx(0, L"MButtonClass", L"", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, width, 22, hwndDlg, (HMENU)cbd->m_dwButtonCID, g_hInst, NULL);
+ HWND hwndButton = CreateWindowEx(0, L"MButtonClass", L"", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, cbd->m_iButtonWidth, 22, hwndDlg, (HMENU)cbd->m_dwButtonCID, g_hInst, NULL);
SendMessage(hwndButton, BUTTONSETASFLATBTN, TRUE, 0);
if (cbd->m_pwszTooltip)
SendMessage(hwndButton, BUTTONADDTOOLTIP, LPARAM(cbd->m_pwszTooltip), BATF_UNICODE);
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp index f6efee312a..cc2a85b382 100644 --- a/plugins/Scriver/src/msgdialog.cpp +++ b/plugins/Scriver/src/msgdialog.cpp @@ -765,8 +765,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP if (!cbd->m_bIMButton)
continue;
- int width = (cbd->m_dwArrowCID) ? 34 : 22;
- HWND hwndButton = CreateWindowEx(0, L"MButtonClass", L"", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, width, 22, hwndDlg, (HMENU)cbd->m_dwButtonCID, g_hInst, NULL);
+ HWND hwndButton = CreateWindowEx(0, L"MButtonClass", L"", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, cbd->m_iButtonWidth, 22, hwndDlg, (HMENU)cbd->m_dwButtonCID, g_hInst, NULL);
SendMessage(hwndButton, BUTTONSETASFLATBTN, TRUE, 0);
if (cbd->m_pwszTooltip)
SendMessage(hwndButton, BUTTONADDTOOLTIP, LPARAM(cbd->m_pwszTooltip), BATF_UNICODE);
diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp index 2bf9c3c699..70e6198234 100644 --- a/plugins/Scriver/src/utils.cpp +++ b/plugins/Scriver/src/utils.cpp @@ -454,7 +454,7 @@ void SetButtonsPos(HWND hwndDlg) if (hwndButton == NULL)
continue;
- int width = iGap + ((cbd->m_dwArrowCID) ? 34 : 22);
+ int width = iGap + cbd->m_iButtonWidth;
if (cbd->m_bRSided) {
iRightX -= width;
hdwp = DeferWindowPos(hdwp, hwndButton, NULL, iRightX, pt.y, 0, 0, SWP_NOZORDER | SWP_NOSIZE);
diff --git a/src/core/stdmsg/src/chat_window.cpp b/src/core/stdmsg/src/chat_window.cpp index 453b979a3a..a116e7f577 100644 --- a/src/core/stdmsg/src/chat_window.cpp +++ b/src/core/stdmsg/src/chat_window.cpp @@ -1095,9 +1095,8 @@ static void SetButtonsPos(HWND hwndDlg) if (hwndButton == NULL) continue; - int width = iGap + ((cbd->m_dwArrowCID) ? 34 : 22); hdwp = DeferWindowPos(hdwp, hwndButton, NULL, iLeftX, pt.y, 0, 0, SWP_NOZORDER | SWP_NOSIZE); - iLeftX += width; + iLeftX += iGap + cbd->m_iButtonWidth; } for (int i = Srmm_GetButtonCount() - 1; i >= 0; i--) { @@ -1109,8 +1108,7 @@ static void SetButtonsPos(HWND hwndDlg) if (hwndButton == NULL) continue; - int width = iGap + ((cbd->m_dwArrowCID) ? 34 : 22); - iRightX -= width; + iRightX -= iGap + cbd->m_iButtonWidth; hdwp = DeferWindowPos(hdwp, hwndButton, NULL, iRightX, pt.y, 0, 0, SWP_NOZORDER | SWP_NOSIZE); } @@ -1136,8 +1134,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar if (!cbd->m_bChatButton) continue; - int width = (cbd->m_dwArrowCID) ? 34 : 22; - HWND hwndButton = CreateWindowEx(0, L"MButtonClass", L"", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, width, 22, hwndDlg, (HMENU)cbd->m_dwButtonCID, g_hInst, NULL); + HWND hwndButton = CreateWindowEx(0, L"MButtonClass", L"", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, cbd->m_iButtonWidth, 22, hwndDlg, (HMENU)cbd->m_dwButtonCID, g_hInst, NULL); SendMessage(hwndButton, BUTTONSETASFLATBTN, TRUE, 0); if (cbd->m_pwszTooltip) SendMessage(hwndButton, BUTTONADDTOOLTIP, LPARAM(cbd->m_pwszTooltip), BATF_UNICODE); diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp index 65ab69b1b2..8f715d0cf5 100644 --- a/src/core/stdmsg/src/msgdialog.cpp +++ b/src/core/stdmsg/src/msgdialog.cpp @@ -490,7 +490,7 @@ static void SetButtonsPos(SrmmWindowData *dat, HWND hwndDlg) for (int i = Srmm_GetButtonCount()-1; i >= 0; i--) {
CustomButtonData *cbd = Srmm_GetNthButton(i);
- int width = iGap + ((cbd->m_dwArrowCID) ? 34 : 22);
+ int width = iGap + cbd->m_iButtonWidth;
HWND hwndButton = GetDlgItem(hwndDlg, cbd->m_dwButtonCID);
if (NULL != hwndButton) /* Wine fix. */ {
@@ -688,8 +688,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM l if (!cbd->m_bIMButton)
continue;
- int width = (cbd->m_dwArrowCID) ? 34 : 22;
- HWND hwndButton = CreateWindowEx(0, L"MButtonClass", L"", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, width, 22, hwndDlg, (HMENU)cbd->m_dwButtonCID, g_hInst, NULL);
+ HWND hwndButton = CreateWindowEx(0, L"MButtonClass", L"", WS_CHILD | WS_VISIBLE | WS_TABSTOP, 0, 0, cbd->m_iButtonWidth, 22, hwndDlg, (HMENU)cbd->m_dwButtonCID, g_hInst, NULL);
if (cbd->m_pwszTooltip)
SendMessage(hwndButton, BUTTONADDTOOLTIP, LPARAM(cbd->m_pwszTooltip), BATF_UNICODE);
if (cbd->m_hIcon)
|