Skip to content

Commit

Permalink
GWL: Fix merge conflict (#12521)
Browse files Browse the repository at this point in the history
Fix merge conflict caused by previous two commits.
  • Loading branch information
fredcw authored Nov 26, 2024
1 parent 998f54e commit 7597667
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions files/usr/share/cinnamon/applets/[email protected]/applet.js
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,7 @@ class GroupedWindowListApplet extends Applet.Applet {
{key: 'left-click-action', value: 'leftClickAction', cb: null},
{key: 'middle-click-action', value: 'middleClickAction', cb: null},
{key: 'show-all-workspaces', value: 'showAllWorkspaces', cb: this.refreshAllWorkspaces},
{key: 'window-display-settings', value: 'windowDisplaySettings', cb: this.reloadAllAppsMonitor},
{key: 'cycleMenusHotkey', value: 'cycleMenusHotkey', cb: this.bindAppKeys},
{key: 'show-apps-order-hotkey', value: 'showAppsOrderHotkey', cb: this.bindAppKeys},
{key: 'show-apps-order-timeout', value: 'showAppsOrderTimeout', cb: null},
Expand Down Expand Up @@ -328,7 +329,6 @@ class GroupedWindowListApplet extends Applet.Applet {
{key: 'show-recent', value: 'showRecent', cb: null},
{key: 'autostart-menu-item', value: 'autoStart', cb: null},
{key: 'monitor-move-all-windows', value: 'monitorMoveAllWindows', cb: null},
{key: 'window-display-settings', value: 'windowDisplaySettings', cb: this.reloadAllAppsMonitor},
{key: 'pinned-apps', value: 'pinnedApps', cb: null}
];

Expand Down Expand Up @@ -501,7 +501,7 @@ class GroupedWindowListApplet extends Applet.Applet {
}

reloadAllAppsMonitor(){
this.refreshAllAppLists();
this.refreshAllWorkspaces();
this.updateMonitorWatchlist();
}

Expand Down

0 comments on commit 7597667

Please sign in to comment.