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

Use correct toolbar style for preferences on macOS 11

Browse Source 
Code compiled against macOS 11 SDK must explicitly specify that the window
should use preferences-style toolbar, otherwise the tabs would be moved to the
right alongside window title, as is done with the standard toolbar now.
This commit is contained in:
Václav Slavík
2020-08-27 18:59:25 +02:00
parent 3f9884817d
commit ab29743097
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/osx/cocoa/preferences.mm
View File

@@ -35,6 +35,7 @@
#include "wx/weakref.h" #include "wx/weakref.h"
#include "wx/windowid.h" #include "wx/windowid.h"
#include "wx/osx/private.h" #include "wx/osx/private.h"
#include "wx/osx/private/available.h"
#import <AppKit/NSWindow.h> #import <AppKit/NSWindow.h>
@@ -62,6 +63,13 @@ public:
m_toolbarRealized(false), m_toolbarRealized(false),
m_visiblePage(NULL) m_visiblePage(NULL)
{ {
#if __MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_16
if ( WX_IS_MACOS_AVAILABLE(11,0) )
{
NSWindow *win = GetWXWindow();
[win setToolbarStyle:NSWindowToolbarStylePreference];
}
#endif
m_toolbar = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_toolbar = new wxToolBar(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTB_FLAT | wxTB_TEXT); wxTB_FLAT | wxTB_TEXT);
m_toolbar->SetToolBitmapSize(wxSize(32,32)); m_toolbar->SetToolBitmapSize(wxSize(32,32));