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

Supporting newer transparent background API

Browse Source
This commit is contained in:
Stefan Csomor
2018-10-22 22:36:42 +02:00
parent 7dfbe50fc0
commit 651e1cd1b5
4 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/wx/osx/window.h
View File

@@ -91,6 +91,7 @@ public:
virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE; virtual bool SetForegroundColour( const wxColour &colour ) wxOVERRIDE;
virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE; virtual bool SetBackgroundStyle(wxBackgroundStyle style) wxOVERRIDE;
virtual bool IsTransparentBackgroundSupported(wxString* reason = NULL) const wxOVERRIDE;
virtual int GetCharHeight() const wxOVERRIDE; virtual int GetCharHeight() const wxOVERRIDE;
virtual int GetCharWidth() const wxOVERRIDE; virtual int GetCharWidth() const wxOVERRIDE;

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

@@ -778,6 +778,13 @@ long style, long extraStyle, const wxString& WXUNUSED(name) )
if ( !(style & wxFRAME_TOOL_WINDOW) ) if ( !(style & wxFRAME_TOOL_WINDOW) )
[m_macWindow setHidesOnDeactivate:NO]; [m_macWindow setHidesOnDeactivate:NO];
if ( GetWXPeer()->GetBackgroundStyle() == wxBG_STYLE_TRANSPARENT )
{
[m_macWindow setOpaque:NO];
[m_macWindow setAlphaValue:1.0];
[m_macWindow setBackgroundColor:[NSColor clearColor]];
}
} }
void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), WXWindow nativeWindow ) void wxNonOwnedWindowCocoaImpl::Create( wxWindow* WXUNUSED(parent), WXWindow nativeWindow )

1
src/osx/nonownedwnd_osx.cpp
View File

@@ -152,6 +152,7 @@ bool wxNonOwnedWindow::Create(wxWindow *parent,
wxWindowCreateEvent event(this); wxWindowCreateEvent event(this);
HandleWindowEvent(event); HandleWindowEvent(event);
if ( GetBackgroundStyle() != wxBG_STYLE_TRANSPARENT )
SetBackgroundColour(wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE )); SetBackgroundColour(wxSystemSettings::GetColour( wxSYS_COLOUR_APPWORKSPACE ));
if ( parent ) if ( parent )

5
src/osx/window_osx.cpp
View File

@@ -518,6 +518,11 @@ bool wxWindowMac::SetBackgroundStyle(wxBackgroundStyle style)
return true; return true;
} }
bool wxWindowMac::IsTransparentBackgroundSupported(wxString* WXUNUSED(reason)) const
{
return true;
}
bool wxWindowMac::SetBackgroundColour(const wxColour& col ) bool wxWindowMac::SetBackgroundColour(const wxColour& col )
{ {
if (m_growBox) if (m_growBox)