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

extract button size calculation from button label size to a separate function to allow reusing it elsewhere

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55474 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-05 14:10:50 +00:00
parent e328b97245
commit 433aca2d0d
2 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/wx/msw/private/button.h
View File

@@ -49,6 +49,10 @@ void UpdateMultilineStyle(HWND hwnd, const wxString& label);
// (implemented in src/msw/button.cpp) // (implemented in src/msw/button.cpp)
wxSize ComputeBestSize(wxControl *btn); wxSize ComputeBestSize(wxControl *btn);
// compute the button size (as if wxBU_EXACTFIT were specified, i.e. without
// adjusting it to be of default size if it's smaller) for the given label size
wxSize GetFittingSize(wxWindow *win, const wxSize& sizeLabel);
} // namespace wxMSWButton } // namespace wxMSWButton
#endif // _WX_MSW_PRIVATE_BUTTON_H_ #endif // _WX_MSW_PRIVATE_BUTTON_H_

36
src/msw/button.cpp
View File

@@ -163,33 +163,41 @@ void wxMSWButton::UpdateMultilineStyle(HWND hwnd, const wxString& label)
::SetWindowLong(hwnd, GWL_STYLE, styleNew); ::SetWindowLong(hwnd, GWL_STYLE, styleNew);
} }
wxSize wxMSWButton::GetFittingSize(wxWindow *win, const wxSize& sizeLabel)
{
// FIXME: this is pure guesswork, need to retrieve the real button margins
wxSize sizeBtn = sizeLabel;
sizeBtn.x += 3*win->GetCharWidth();
sizeBtn.y = 11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(sizeLabel.y)/10;
return sizeBtn;
}
wxSize wxMSWButton::ComputeBestSize(wxControl *btn) wxSize wxMSWButton::ComputeBestSize(wxControl *btn)
{ {
wxClientDC dc(btn); wxClientDC dc(btn);
wxCoord wBtn, wxSize sizeBtn;
hBtn; dc.GetMultiLineTextExtent(btn->GetLabelText(), &sizeBtn.x, &sizeBtn.y);
dc.GetMultiLineTextExtent(btn->GetLabelText(), &wBtn, &hBtn);
// FIXME: this is pure guesswork, need to retrieve the real button margins sizeBtn = GetFittingSize(btn, sizeBtn);
wBtn += 3*btn->GetCharWidth();
hBtn = 11*EDIT_HEIGHT_FROM_CHAR_HEIGHT(hBtn)/10;
// all buttons have at least the standard size unless the user explicitly // all buttons have at least the standard size unless the user explicitly
// wants them to be of smaller size and used wxBU_EXACTFIT style when // wants them to be of smaller size and used wxBU_EXACTFIT style when
// creating the button // creating the button
if ( !btn->HasFlag(wxBU_EXACTFIT) ) if ( !btn->HasFlag(wxBU_EXACTFIT) )
{ {
wxSize sz = wxButton::GetDefaultSize(); wxSize sizeDef = wxButton::GetDefaultSize();
if ( wBtn < sz.x ) if ( sizeBtn.x < sizeDef.x )
wBtn = sz.x; sizeBtn.x = sizeDef.x;
if ( hBtn < sz.y ) if ( sizeBtn.y < sizeDef.y )
hBtn = sz.y; sizeBtn.y = sizeDef.y;
} }
wxSize best(wBtn, hBtn); btn->CacheBestSize(sizeBtn);
btn->CacheBestSize(best);
return best; return sizeBtn;
} }
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------