From 23b767ee9c6501513693569462a7f2f9c43bca30 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Fri, 27 Apr 2012 14:43:49 +0200 Subject: [PATCH] Fixed issue #1141: Sync dialog local branch combo box too short Signed-off-by: Sven Strickroth --- src/Changelog.txt | 1 + src/TortoiseProc/SyncDlg.cpp | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Changelog.txt b/src/Changelog.txt index 20187288f..4130fe875 100644 --- a/src/Changelog.txt +++ b/src/Changelog.txt @@ -17,6 +17,7 @@ * Fixed issue #153: Empty error messagebox when starting rebase dialog * Fixed issue #1140: Settings page does not inherit msysgit system-wide config * Fixed issue #1146: Add hotkey for option "All Branches" in log dialog + * Fixed issue #1141: Sync dialog local branch combo box too short = Release 1.7.8.0 = == Features== diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp index c9bda0b4b..dfe4f2f74 100644 --- a/src/TortoiseProc/SyncDlg.cpp +++ b/src/TortoiseProc/SyncDlg.cpp @@ -714,7 +714,12 @@ BOOL CSyncDlg::OnInitDialog() AddAnchor(IDC_ANIMATE_SYNC,TOP_LEFT); AddAnchor(IDC_BUTTON_COMMIT,BOTTOM_LEFT); - BRANCH_COMBOX_ADD_ANCHOR(); + // do not use BRANCH_COMBOX_ADD_ANCHOR here, we want to have different stylings + AddAnchor(IDC_COMBOBOXEX_LOCAL_BRANCH, TOP_LEFT,TOP_CENTER); + AddAnchor(IDC_COMBOBOXEX_REMOTE_BRANCH, TOP_CENTER, TOP_RIGHT); + AddAnchor(IDC_BUTTON_LOCAL_BRANCH, TOP_CENTER); + AddAnchor(IDC_BUTTON_REMOTE_BRANCH, TOP_RIGHT); + AddAnchor(IDC_STATIC_REMOTE_BRANCH, TOP_CENTER); this->GetDlgItem(IDC_BUTTON_COMMIT)->ShowWindow(SW_HIDE); -- 2.11.4.GIT