maximus-buttons@hanspr & maximus-title@hanspr: Fix reported bugs (#8185)

hanspr · web-flow · commit 904917ab94fc · 2026-01-11T16:56:59.000-05:00
* Fixes #8177
diff --git a/maximus-buttons@hanspr/files/maximus-buttons@hanspr/applet.js b/maximus-buttons@hanspr/files/maximus-buttons@hanspr/applet.js
@@ -49,7 +49,6 @@ class MyApplet extends Applet.TextIconApplet {
         this.settings.bind("buttons-theme", "buttonsTheme")
         this.settings.bind("only-maximized", "onlyMaximized", this.on_settings_changed)
         this.settings.bind("hide-buttons", "hideButtons", this.on_settings_changed)
-        this.settings.bind("on-desktop-shutdown", "onDesktopShutdown", this.on_settings_changed)
     }
 
     connectSignals() {
@@ -209,8 +208,6 @@ class MyApplet extends Applet.TextIconApplet {
             if (button == 1) {
                 this.closeWindow()
                 return true
-            } else if (button == 3) {
-                this._applet_context_menu.toggle()
             }
             return true
         })
@@ -223,12 +220,7 @@ class MyApplet extends Applet.TextIconApplet {
         let activeWindow = global.display.focus_window
         let app = tracker.get_window_app(activeWindow)
 
-        if (!app) {
-            if (this.onDesktopShutdown == true) {
-                this._session.ShutdownRemote()
-            }
-            return
-        } else {
+        if (app) {
             activeWindow.delete(global.get_current_time())
         }
 
@@ -268,7 +260,7 @@ class MyApplet extends Applet.TextIconApplet {
             return
         }
         //console.log("WINDOW TYPE = ", w.get_window_type())
-        if (w.get_window_type() >= 5) {
+        if (w.get_window_type() >= 5 || w.get_window_type() == 1) {
             this.setButtons("hide")
             return
         }
diff --git a/maximus-buttons@hanspr/files/maximus-buttons@hanspr/metadata.json b/maximus-buttons@hanspr/files/maximus-buttons@hanspr/metadata.json
@@ -4,7 +4,7 @@
     "uuid": "maximus-buttons@hanspr",
     "name": "Maximus Buttons",
     "website": "https://github.com/linuxmint/cinnamon-spices-applets",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "author": "hanspr",
     "contributors": "Hans Peyrot"
 }
diff --git a/maximus-buttons@hanspr/files/maximus-buttons@hanspr/po/maximus-buttons@hanspr.pot b/maximus-buttons@hanspr/files/maximus-buttons@hanspr/po/maximus-buttons@hanspr.pot
@@ -0,0 +1,82 @@
+# MAXIMUS BUTTONS
+# This file is put in the public domain.
+# hanspr, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: maximus-buttons@hanspr 0.0.3\n"
+"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-applets/"
+"issues\n"
+"POT-Creation-Date: 2026-01-11 16:54-0500\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. metadata.json->description
+msgid "Maximus buttons"
+msgstr ""
+
+#. metadata.json->name
+msgid "Maximus Buttons"
+msgstr ""
+
+#. metadata.json->contributors
+msgid "Hans Peyrot"
+msgstr ""
+
+#. settings-schema.json->head->description
+msgid "Window Buttons Settings"
+msgstr ""
+
+#. settings-schema.json->buttons-style->description
+msgid "Window Buttons Style  (Example: minimize:maximize:close:icon)"
+msgstr ""
+
+#. settings-schema.json->buttons-theme->description
+msgid "Buttons Theme  (Needs Restart Cinnamon)"
+msgstr ""
+
+#. settings-schema.json->buttons-theme->options
+msgid "Default"
+msgstr ""
+
+#. settings-schema.json->buttons-theme->options
+msgid "Mac-OS-X"
+msgstr ""
+
+#. settings-schema.json->buttons-theme->options
+msgid "Mint-X"
+msgstr ""
+
+#. settings-schema.json->buttons-theme->options
+msgid "Radiance"
+msgstr ""
+
+#. settings-schema.json->buttons-theme->options
+msgid "UniMetro"
+msgstr ""
+
+#. settings-schema.json->buttons-theme->options
+msgid "UniMetro-Black"
+msgstr ""
+
+#. settings-schema.json->buttons-theme->options
+msgid "Vimix"
+msgstr ""
+
+#. settings-schema.json->buttons-theme->tooltip
+msgid "Please select a theme for window buttons"
+msgstr ""
+
+#. settings-schema.json->hide-buttons->description
+msgid "Hide buttons: instead of removing (no applets jump left right)"
+msgstr ""
+
+#. settings-schema.json->only-maximized->description
+msgid "Show buttons: only when focused window is maximized"
+msgstr ""
diff --git a/maximus-buttons@hanspr/files/maximus-buttons@hanspr/settings-schema.json b/maximus-buttons@hanspr/files/maximus-buttons@hanspr/settings-schema.json
@@ -5,7 +5,7 @@
     },
     "buttons-style": {
         "type": "entry",
-        "description": "Window Buttons Style  (Example: title:minimize:maximize:close:icon)",
+        "description": "Window Buttons Style  (Example: minimize:maximize:close:icon)",
         "default": "minimize:maximize:close"
     },
     
@@ -24,11 +24,6 @@
         },
         "tooltip": "Please select a theme for window buttons"
     },
-    "on-desktop-shutdown": {
-        "type": "switch",
-        "default": false,
-        "description": "Click on close: poweroff if desktop is focused"
-    },
     "hide-buttons": {
         "type": "switch",
         "default": true,
diff --git a/maximus-title@hanspr/files/maximus-title@hanspr/applet.js b/maximus-title@hanspr/files/maximus-title@hanspr/applet.js
@@ -15,7 +15,6 @@ class MyApplet extends Applet.TextIconApplet {
             this.regex = null
             this.bindSettings()
             this.connectSignals()
-            this.lastTitle = ""
             this.cssFocus = "background-color:;border-radius:5px;padding-right:10px;padding-left:5px;"
             this._regexChanged()
             this._bgChanged()
@@ -41,72 +40,74 @@ class MyApplet extends Applet.TextIconApplet {
             let w = global.display.focus_window
             if (w) {
                 this.signalManager.connect(w, 'notify::title', () => {
-                    this._onTitleChange(w.lastTitle, w.get_monitor())
+                    this._onTitleChange()
                 })
-                this._onTitleChange(w.lastTitle, w.get_monitor())
-            } else {
-                this._onTitleChange(undefined, 0)
             }
+            this._onTitleChange()
         }, this)
         this.signalManager.connect(global.screen, 'window-monitor-changed', () => {
             let w = global.display.focus_window
             if (w) {
-                this._onMonitorChange(w.lastTitle, w.get_monitor())
+                this._onMonitorChange(w.get_monitor())
             }
         }, this)
     }
 
-    _onMonitorChange(title, monitorIndex) {
+    _onMonitorChange(monitorIndex) {
         if (monitorIndex != this.panel.monitorIndex) {
-            let title = ""
-            const windows = global.get_window_actors();
-            for (let i = 0; i < windows.length; i++) {
-                if (this.panel.monitorIndex != windows[i].metaWindow.get_monitor() || windows[i].metaWindow.get_window_type() > 1) {
-                    continue
-                }
-                //console.log("pass :", i)
-                //console.log("title:", windows[i].metaWindow.title)
-                //console.log("type :", windows[i].metaWindow.get_window_type())
-                title = windows[i].metaWindow.title
-            }
-            this._onTitleChange(title, this.panel.monitorIndex)
-            this.actor.set_style("")
+            let title = this._getTopWindowFromMonitor(this.panel.monitorIndex)
+            this._setTitle(title, "")
             return
         }
-        this._onTitleChange(title, monitorIndex)
+        this._onTitleChange()
     }
 
-    _onTitleChange(title, monitorIndex) {
-        if (monitorIndex != this.panel.monitorIndex) {
-            this.actor.set_style("")
-            return
-        }
-        if (title == undefined) {
-            try {
-                title = global.display.focus_window.get_title()
-            } catch (e) {
-                return
+    _getTopWindowFromMonitor(monitorIndex) {
+        const panelMonitorIndex = this.panel.monitorIndex
+        const windows = global.get_window_actors();
+        for (let i = windows.length - 1; i > 0; i--) {
+            if (panelMonitorIndex != windows[i].metaWindow.get_monitor() || windows[i].metaWindow.get_window_type() > 10) {
+                continue
             }
+            //console.log("pass :", i)
+            //console.log("title:", windows[i].metaWindow.title)
+            //console.log("type :", windows[i].metaWindow.get_window_type())
+            return windows[i].metaWindow.title
         }
-        if (this.lastTitle == title) {
-            this.actor.set_style(this.cssFocus)
+        return ""
+    }
+
+    _onTitleChange() {
+        let w
+        try {
+            w = global.display.focus_window
+        } catch (e) {
+            return
+        }
+        if (w.get_monitor() != this.panel.monitorIndex) {
+            let title = this._getTopWindowFromMonitor(w.get_monitor())
+            this._setTitle(title, "")
             return
         }
-        this.lastTitle = title
+        this._setTitle(w.get_title(), this.cssFocus)
+    }
+
+    _setTitle(title, css) {
         if (this.regex != null) {
             title = title.replace(this.regex, "")
         }
         title = title.substring(0, this.titleLength)
         this.set_applet_label(title)
-        this.actor.set_style(this.cssFocus)
+        this.actor.set_style(css)
     }
 
     _lengthChanged() {
-        this._onTitleChange(this.lastTitle)
+        this._onTitleChange()
     }
 
     _bgChanged() {
         this.cssFocus = "background-color:" + this.titleBg + ";border-radius:5px;padding-right:10px;padding-left:5px;"
+        this._onTitleChange()
     }
 
     _regexChanged() {
@@ -116,11 +117,10 @@ class MyApplet extends Applet.TextIconApplet {
             try {
                 this.regex = new RegExp(this.titleRegex)
             } catch (e) {
-                console.log("Regex error:", e)
+                console.log("Maximus-title: user Regex error:", e)
                 this.regex = null
             }
         }
-        this.lastTitle = ""
         this._onTitleChange()
     }
 }
diff --git a/maximus-title@hanspr/files/maximus-title@hanspr/metadata.json b/maximus-title@hanspr/files/maximus-title@hanspr/metadata.json
@@ -1,7 +1,7 @@
 {
     "uuid": "maximus-title@hanspr",
     "description": "Maximus show title for the current window",
-    "version": "0.0.1",
+    "version": "0.0.2",
     "name": "Maximus window title",
     "max-instances": -1
 }
diff --git a/maximus-title@hanspr/files/maximus-title@hanspr/po/maximus-title@hanspr.pot b/maximus-title@hanspr/files/maximus-title@hanspr/po/maximus-title@hanspr.pot
@@ -0,0 +1,42 @@
+# MAXIMUS WINDOW TITLE
+# This file is put in the public domain.
+# hanspr, 2025
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: maximus-title@hanspr 0.0.2\n"
+"Report-Msgid-Bugs-To: https://github.com/linuxmint/cinnamon-spices-applets/"
+"issues\n"
+"POT-Creation-Date: 2026-01-11 16:54-0500\n"
+"PO-Revision-Date: \n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. metadata.json->description
+msgid "Maximus show title for the current window"
+msgstr ""
+
+#. metadata.json->name
+msgid "Maximus window title"
+msgstr ""
+
+#. settings-schema.json->head->description
+msgid "Window Title Settings"
+msgstr ""
+
+#. settings-schema.json->title-len->description
+msgid "Maximum title lenght"
+msgstr ""
+
+#. settings-schema.json->title-bg->description
+msgid "Title focused background color"
+msgstr ""
+
+#. settings-schema.json->title-regex->description
+msgid "Apply regex to title to remove string, before showing"
+msgstr ""

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`"uuid": "maximus-buttons@hanspr",`
`5`	`5`	`"name": "Maximus Buttons",`
`6`	`6`	`"website": "https://github.com/linuxmint/cinnamon-spices-applets",`
`7`		`- "version": "0.0.2",`
	`7`	`+ "version": "0.0.3",`
`8`	`8`	`"author": "hanspr",`
`9`	`9`	`"contributors": "Hans Peyrot"`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"uuid": "maximus-title@hanspr",`
`3`	`3`	`"description": "Maximus show title for the current window",`
`4`		`- "version": "0.0.1",`
	`4`	`+ "version": "0.0.2",`
`5`	`5`	`"name": "Maximus window title",`
`6`	`6`	`"max-instances": -1`
`7`	`7`	`}`