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

Implement shaped windows closer to other platforms

Browse Source 
wxFRAME_SHAPED is not needed anymore under OSX and a shaped window can just have a background color, does not need a paint handler.
This commit is contained in:
Stefan Csomor
2018-10-25 20:13:40 +02:00
parent 67e51e7b6d
commit f257780771
3 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osx/cocoa/nonownedwnd.mm
View File

@@ -769,12 +769,6 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
[m_macWindow setDelegate:controller]; [m_macWindow setDelegate:controller];
[controller addObservers:m_macWindow]; [controller addObservers:m_macWindow];
if ( ( style & wxFRAME_SHAPED) )
{
[m_macWindow setOpaque:NO];
[m_macWindow setAlphaValue:1.0];
}
if ( !(style & wxFRAME_TOOL_WINDOW) ) if ( !(style & wxFRAME_TOOL_WINDOW) )
[m_macWindow setHidesOnDeactivate:NO]; [m_macWindow setHidesOnDeactivate:NO];

11
src/osx/cocoa/window.mm
View File

@@ -3136,7 +3136,14 @@ void wxWidgetCocoaImpl::SetBackgroundColour( const wxColour &col )
if ( [targetView respondsToSelector:@selector(setBackgroundColor:) ] ) if ( [targetView respondsToSelector:@selector(setBackgroundColor:) ] )
{ {
[targetView setBackgroundColor: col.OSXGetNSColor()]; wxWindow* peer = GetWXPeer();
if ( peer->GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
{
wxTopLevelWindow* toplevel = wxDynamicCast(peer,wxTopLevelWindow);
if ( toplevel == NULL || toplevel->GetShape().IsEmpty() )
[targetView setBackgroundColor: col.OSXGetNSColor()];
}
} }
} }
@@ -3147,6 +3154,8 @@ bool wxWidgetCocoaImpl::SetBackgroundStyle( wxBackgroundStyle style )
if ( [m_osxView respondsToSelector:@selector(setOpaque:) ] ) if ( [m_osxView respondsToSelector:@selector(setOpaque:) ] )
{ {
[m_osxView setOpaque: opaque]; [m_osxView setOpaque: opaque];
if ( style == wxBG_STYLE_TRANSPARENT )
[m_osxView setBackgroundColor:[NSColor clearColor]];
} }
return true ; return true ;

16
src/osx/nonownedwnd_osx.cpp
View File

@@ -254,17 +254,13 @@ wxPoint wxNonOwnedWindow::GetClientAreaOrigin() const
bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c ) bool wxNonOwnedWindow::SetBackgroundColour(const wxColour& c )
{ {
if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
return false ;
// only set the native background color if the toplevel window's // only set the native background color if the toplevel window's
// background is not supposed to be transparent, otherwise the // background is not supposed to be transparent, otherwise the
// transparency is lost // transparency is lost
if( GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT || if ( GetBackgroundStyle() != wxBG_STYLE_PAINT && GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT)
(GetWindowStyle() & wxFRAME_SHAPED) )
return false;
if ( !wxWindow::SetBackgroundColour(c) && m_hasBgCol )
return false ;
if ( GetBackgroundStyle() != wxBG_STYLE_CUSTOM )
{ {
if ( m_nowpeer ) if ( m_nowpeer )
return m_nowpeer->SetBackgroundColour(c); return m_nowpeer->SetBackgroundColour(c);
@@ -522,6 +518,10 @@ bool wxNonOwnedWindow::DoSetRegionShape(const wxRegion& region)
{ {
m_shape = region; m_shape = region;
// set the native content view to transparency, this is an implementation detail
// no reflected in the wx BackgroundStyle
GetPeer()->SetBackgroundStyle(wxBG_STYLE_TRANSPARENT);
return m_nowpeer->SetShape(region); return m_nowpeer->SetShape(region);
} }