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

Merge branch 'msw-statbmp-fix-and-opt'

Browse Source 
A fix and some cleanup/optimizations for wxMSW wxStaticBitmap.

See https://github.com/wxWidgets/wxWidgets/pull/1322
This commit is contained in:
Vadim Zeitlin
2019-05-18 14:23:45 +02:00
parent 7fee108177 2039d864ba
commit 885d80ef22
1 changed files with 29 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
src/msw/statbmp.cpp
View File

@@ -104,9 +104,12 @@ bool wxStaticBitmap::Create(wxWindow *parent,
// we may have either bitmap or icon: if a bitmap with mask is passed, we // we may have either bitmap or icon: if a bitmap with mask is passed, we
// will transform it to an icon ourselves because otherwise the mask will // will transform it to an icon ourselves because otherwise the mask will
// be ignored by Windows // be ignored by Windows
m_isIcon = bitmap.IsKindOf(wxCLASSINFO(wxIcon));
wxGDIImage *image = ConvertImage( bitmap ); wxGDIImage *image = ConvertImage( bitmap );
// Note that m_isIcon must be set before calling MSWCreateControl() so that
// it creates the control with the correct style, as returned by
// MSWGetStyle(), which uses m_isIcon to determine whether to use SS_ICON
// or SS_BITMAP.
m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) ); m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );
// create the native control // create the native control
@@ -278,8 +281,20 @@ void wxStaticBitmap::MSWReplaceImageHandle(WXLPARAM handle)
void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image) void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
{ {
wxSize sizeOld;
if ( m_image )
sizeOld = m_image->GetSize();
wxSize sizeNew;
if ( image )
sizeNew = image->GetSize();
const bool wasIcon = m_isIcon;
Free(); Free();
InvalidateBestSize();
if ( sizeNew != sizeOld )
InvalidateBestSize();
m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) ); m_isIcon = image->IsKindOf( wxCLASSINFO(wxIcon) );
// the image has already been copied // the image has already been copied
@@ -313,28 +328,25 @@ void wxStaticBitmap::SetImageNoCopy( wxGDIImage* image)
} }
} }
#endif // wxUSE_WXDIB #endif // wxUSE_WXDIB
wxMSWWinStyleUpdater(GetHwnd())
.TurnOff(SS_BITMAP | SS_ICON) if ( m_isIcon != wasIcon )
.TurnOn(m_isIcon ? SS_ICON : SS_BITMAP); {
wxMSWWinStyleUpdater(GetHwnd())
.TurnOff(SS_BITMAP | SS_ICON)
.TurnOn(m_isIcon ? SS_ICON : SS_BITMAP);
}
MSWReplaceImageHandle((WXLPARAM)handle); MSWReplaceImageHandle((WXLPARAM)handle);
DeleteCurrentHandleIfNeeded();
m_currentHandle = (WXHANDLE)handle; m_currentHandle = (WXHANDLE)handle;
m_ownsCurrentHandle = handle != handleOrig; m_ownsCurrentHandle = handle != handleOrig;
if ( ImageIsOk() ) if ( sizeNew != sizeOld )
{ {
int width = image->GetWidth(), w += sizeNew.x - sizeOld.x;
height = image->GetHeight(); h += sizeNew.y - sizeOld.y;
if ( width && height )
{
w = width;
h = height;
MSWMoveWindowToAnyPosition(GetHwnd(), x, y, width, height, false); MSWMoveWindowToAnyPosition(GetHwnd(), x, y, w, h, false);
}
} }
RECT rect; RECT rect;