Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take into account tool placing value in contructing tools with controls.

Browse Source 
Tool padding value should be taken into account also in sizing custom made tools (with controls) to get the same visual appearance and behaviour for all tools (buttons).
This commit is contained in:
Artur Wieczorek
2015-12-16 21:41:12 +01:00
parent 8fdf4221dc
commit 2dd87a93df
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/msw/toolbar.cpp
View File

@@ -935,10 +935,11 @@ bool wxToolBar::Realize()
} }
// Set separator width/height to fit the control width/height // Set separator width/height to fit the control width/height
// taking into account tool padding value.
// (height is not used but it is set for the sake of consistency). // (height is not used but it is set for the sake of consistency).
{ {
const wxSize sizeControl = tool->GetControl()->GetSize(); const wxSize sizeControl = tool->GetControl()->GetSize();
button.iBitmap = IsVertical() ? sizeControl.y : sizeControl.x; button.iBitmap = m_toolPacking + (IsVertical() ? sizeControl.y : sizeControl.x);
} }
wxFALLTHROUGH; wxFALLTHROUGH;
@@ -1139,14 +1140,15 @@ bool wxToolBar::Realize()
staticText->Show(); staticText->Show();
} }
control->Move(r.left, r.top + (diff + 1) / 2); // Take also into account tool padding value.
control->Move(r.left + m_toolPacking/2, r.top + (diff + 1) / 2);
if ( staticText ) if ( staticText )
{ {
staticText->Move(r.left + (size.x - staticTextSize.x)/2, staticText->Move(r.left + m_toolPacking/2 + (size.x - staticTextSize.x)/2,
r.bottom - staticTextSize.y); r.bottom - staticTextSize.y);
} }
m_totalFixedSize += size.x; m_totalFixedSize += r.right - r.left;
} }
// the max index is the "real" number of buttons - i.e. counting even the // the max index is the "real" number of buttons - i.e. counting even the