Merge pull request #3602 from osmandapp/Reset-to-default-for-widgets-…

…doesnt-work Fixed and sync code with android
osmandapp · Apr 18, 2024 · 5419f75 · 5419f75
2 parents 13afa60 + d09c863
commit 5419f75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/Sources/Controllers/Map/Widgets/Helpers/WidgetsSettingsHelper.swift b/Sources/Controllers/Map/Widgets/Helpers/WidgetsSettingsHelper.swift
@@ -159,9 +159,13 @@ class WidgetsSettingsHelper: NSObject {
         let widgetInfos = widgetRegistry.getWidgetsForPanel(appMode, filterModes: Int(kWidgetModeMatchingPanels), panels: panels)
         for widgetInfo in widgetInfos! {
             guard let widgetInfo = widgetInfo as? MapWidgetInfo else { continue }
-            // Disable "false" (not reset "nil"), because visible by default widget should be disabled in non-default panel
-            let enabled: NSNumber? = isOriginalWidgetOnAnotherPanel(widgetInfo: widgetInfo) ? NSNumber(value: false) : nil
-            widgetRegistry.enableDisableWidget(for: appMode, widgetInfo: widgetInfo, enabled: enabled, recreateControls: false)
+            if WidgetType.isOriginalWidget(widgetInfo.key) && WidgetsAvailabilityHelper.isWidgetVisibleByDefault(widgetId: widgetInfo.key, appMode: appMode) {
+                widgetRegistry.enableDisableWidget(for: appMode, widgetInfo: widgetInfo, enabled: true, recreateControls: false)
+            } else {
+                // Disable "false" (not reset "nil"), because visible by default widget should be disabled in non-default panel
+                let enabled: NSNumber? = isOriginalWidgetOnAnotherPanel(widgetInfo: widgetInfo) ? NSNumber(value: false) : nil
+                widgetRegistry.enableDisableWidget(for: appMode, widgetInfo: widgetInfo, enabled: enabled, recreateControls: false)
+            }
         }
         panel.getOrderPreference().resetMode(toDefault: appMode)
     }

diff --git a/Sources/Controllers/Map/Widgets/OAMapWidgetRegistry.h b/Sources/Controllers/Map/Widgets/OAMapWidgetRegistry.h
@@ -17,7 +17,7 @@
 #define kWidgetModeEnabled 0x2
 #define KWidgetModeAvailable 0x4
 #define kWidgetModeDefault 0x8
-#define kWidgetModeMatchingPanels 0x16
+#define kWidgetModeMatchingPanels 0x10
 
 #define kWidgetRegisteredNotification @"onWidgetRegistered"
 #define kWidgetVisibilityChangedMotification @"onWidgetVisibilityChanged"