From f1626034edeefe7ffcca6c493110a908aac62b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20=C3=81ngel=20San=20Mart=C3=ADn?= Date: Fri, 7 Nov 2014 23:02:29 +0100 Subject: [PATCH] disabled user customization in MacOSX toolbars --- custom_widgets/yacreader_macosx_toolbar.mm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/custom_widgets/yacreader_macosx_toolbar.mm b/custom_widgets/yacreader_macosx_toolbar.mm index defaba1d..9167df6c 100644 --- a/custom_widgets/yacreader_macosx_toolbar.mm +++ b/custom_widgets/yacreader_macosx_toolbar.mm @@ -158,8 +158,8 @@ YACReaderMacOSXToolbar::YACReaderMacOSXToolbar(QObject *parent) { //setup native toolbar nativeToolBar= nativeToolbar(); - [nativeToolBar setSizeMode:NSToolbarSizeModeSmall]; [nativeToolBar setDisplayMode:NSToolbarDisplayModeIconOnly]; + [nativeToolBar setAllowsUserCustomization:NO]; delegate = [[MyToolbarDelegate alloc] init]; ((MyToolbarDelegate *)delegate)->mytoolbar = this; @@ -171,10 +171,16 @@ YACReaderMacOSXToolbar::YACReaderMacOSXToolbar(QObject *parent) { yosemite = true; [nswindow setTitleVisibility:1]; + [nativeToolBar setSizeMode:NSToolbarSizeModeSmall]; //TODO figure out how to load specific images in Yosemite }else + { + [nativeToolBar setSizeMode:NSToolbarSizeModeSmall]; yosemite = false; + } #else yosemite = false; + [nativeToolBar setAutosavesConfiguration:YES]; //TODO this doesn't work + [nativeToolBar setSizeMode:NSToolbarSizeModeSmall]; #endif }