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

Force size to integer coordinates in all cases.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@34283 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Elliott
2005-05-23 06:03:51 +00:00
parent b9d29922de
commit e9247fdad9
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/cocoa/stattext.mm
View File

@@ -74,11 +74,15 @@ void wxStaticText::SetLabel(const wxString& label)
wxLogTrace(wxTRACE_COCOA_Window_Size, "wxStaticText::SetLabel Old Position: (%d,%d)", GetPosition().x, GetPosition().y); wxLogTrace(wxTRACE_COCOA_Window_Size, "wxStaticText::SetLabel Old Position: (%d,%d)", GetPosition().x, GetPosition().y);
[GetNSTextField() sizeToFit]; [GetNSTextField() sizeToFit];
NSRect newFrameRect = [GetNSTextField() frame]; NSRect newFrameRect = [GetNSTextField() frame];
// Ensure new size is an integer so GetSize returns valid data
newFrameRect.size.height = ceil(newFrameRect.size.height);
newFrameRect.size.width = ceil(newFrameRect.size.width);
if(![superview isFlipped]) if(![superview isFlipped])
{ {
newFrameRect.origin.y = oldFrameRect.origin.y + oldFrameRect.size.height - newFrameRect.size.height; newFrameRect.origin.y = oldFrameRect.origin.y + oldFrameRect.size.height - newFrameRect.size.height;
[GetNSTextField() setFrame:newFrameRect];
} }
[GetNSTextField() setFrame:newFrameRect];
// New origin (wx coords) should always match old origin
wxLogTrace(wxTRACE_COCOA_Window_Size, "wxStaticText::SetLabel New Position: (%d,%d)", GetPosition().x, GetPosition().y); wxLogTrace(wxTRACE_COCOA_Window_Size, "wxStaticText::SetLabel New Position: (%d,%d)", GetPosition().x, GetPosition().y);
[[GetNSTextField() superview] setNeedsDisplayInRect:oldFrameRect]; [[GetNSTextField() superview] setNeedsDisplayInRect:oldFrameRect];