fix widget visibility when 'Automatically hide and show the menu bar'…

… turned on
exelban · Apr 11, 2020 · c62301b · c62301b
1 parent b789b2d
commit c62301b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/Stats.xcodeproj/project.pbxproj b/Stats.xcodeproj/project.pbxproj
@@ -742,7 +742,7 @@
  CODE_SIGN_IDENTITY = "Mac Developer";
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 4;
+ CURRENT_PROJECT_VERSION = 1;
  DEVELOPMENT_TEAM = RP2S87B72W;
  ENABLE_HARDENED_RUNTIME = YES;
  FRAMEWORK_SEARCH_PATHS = (
@@ -756,7 +756,7 @@
  "@executable_path/../Frameworks",
  );
  MACOSX_DEPLOYMENT_TARGET = 10.13;
- MARKETING_VERSION = 1.6.0;
+ MARKETING_VERSION = 1.6.1;
  PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";
@@ -773,7 +773,7 @@
  CODE_SIGN_IDENTITY = "Mac Developer";
  CODE_SIGN_STYLE = Automatic;
  COMBINE_HIDPI_IMAGES = YES;
- CURRENT_PROJECT_VERSION = 4;
+ CURRENT_PROJECT_VERSION = 1;
  DEVELOPMENT_TEAM = RP2S87B72W;
  ENABLE_HARDENED_RUNTIME = YES;
  FRAMEWORK_SEARCH_PATHS = (
@@ -787,7 +787,7 @@
  "@executable_path/../Frameworks",
  );
  MACOSX_DEPLOYMENT_TARGET = 10.13;
- MARKETING_VERSION = 1.6.0;
+ MARKETING_VERSION = 1.6.1;
  PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
  PRODUCT_NAME = "$(TARGET_NAME)";
  PROVISIONING_PROFILE_SPECIFIER = "";

diff --git a/Stats/Widgets/Widget.swift b/Stats/Widgets/Widget.swift
@@ -44,7 +44,12 @@ struct Widgets {
 
 struct WidgetSize {
  let width: CGFloat = 32
- let height: CGFloat = NSApplication.shared.mainMenu?.menuBarHeight ?? 22
+ var height: CGFloat {
+ get {
+ let systemHeight = NSApplication.shared.mainMenu?.menuBarHeight
+ return (systemHeight == 0 ? 22 : systemHeight)!
+ }
+ }
  let margin: CGFloat = 2
 }
 let widgetSize = WidgetSize()