Skip to content

Golden Gate: Alt+Tab по-маковски и «Системные настройки» вместо Quickshell / Alt+Tab follows the skin, System Settings not Quickshell - #148

Closed
Alastor1991 wants to merge 3 commits into
MixaDoDs:mainfrom
Alastor1991:shell-settings-icon
Closed

Alastor1991 wants to merge 3 commits into
MixaDoDs:mainfrom
Alastor1991:shell-settings-icon

Conversation

@Alastor1991

Copy link
Copy Markdown
Contributor

Alt+Tab по скину

В Golden Gate маковский переключатель (AltTabMac) открывался только по ⌘Tab из профиля маковских клавиш. Если этот профиль выключен, Alt+Tab в Golden Gate всегда показывал пиксельный переключатель, и темы смешивались.

Теперь Alt+Tab сам выбирает вид по скину:

  • в Golden Gate открывается маковский переключатель программ, тот же, что по ⌘Tab;
  • в пиксельных скинах всё как раньше, их пиксельные переключатели.

Для этого в AltTab режим (mode: окна или программы) отделён от клавиши, отпускание которой выбирает (modKey: meta для ⌘Tab, alt для Alt+Tab). Так работают и alt-watch.py, и запасной путь в AltTabHost. Бинды niri не менялись.

«Системные настройки», а не Quickshell

У окна настроек angelOS app_id Quickshell, поэтому и запись .desktop находилась от Quickshell. У свёрнутой миниатюры в Dock и в маковском переключателе показывались зелёная шестерёнка и имя Quickshell. Проверку, которую уже делали AppMenu.shellSettings и значок «Системные настройки» в Dock, я вынес в AppMenu.isShellSettings(w). Теперь по ней решают и эти места: имя «Системные настройки», значок preferences-system.

Проверено

  • Руками на живом шелле: Alt+Tab в Golden Gate.
  • scripts/qml-check.sh: 710 файлов, 0 ошибок.
  • tests/halo/run.sh: 25 проверок.
  • scripts/test-ui.sh: 504 прошли, 13 упали. Среди упавших нет ни Alt+Tab, ни Dock, ни страниц Golden Gate: это сцены демона и выхода в игре, OCR, чат стрима, ритм-режим, мастер первого запуска и TypeError в Network.qml. С main я это не сравнивал.
EN
  • Alt+Tab follows the skin. With Golden Gate it opens the Mac app switcher (as ⌘Tab does); with the pixel skins their pixel ones as before. Golden Gate had the Mac one only on ⌘Tab in the Mac key profile, so with that off Alt+Tab was always pixel. AltTab's mode is now apart from the key whose release picks (modKey: meta for ⌘Tab, alt for Alt+Tab), for alt-watch.py and the host's fallback alike. niri's binds are unchanged.
  • System Settings, not Quickshell. angelOS's Settings window has Quickshell's app id, so the minimized window's corner in the Dock and the Mac switcher showed Quickshell's green gear and name. AppMenu.isShellSettings(w) (what AppMenu.shellSettings and the Dock's System Settings already checked) decides there too.

Tested by hand on a live shell; qml-check 710 files / 0 errors; tests/halo 25 checks; test-ui 504 passed, 13 failed, none in Alt+Tab, the Dock or the Golden Gate pages (not compared with main).

🤖 Generated with Claude Code

Alastor1991 and others added 3 commits November 1, 2026 20:16
…hell, in the Dock and ⌘Tab

- Alt+Tab follows the skin: with Golden Gate it opens the Mac app switcher
  (AltTabMac, as ⌘Tab does), with the pixel skins their pixel ones as before.
  Before, Golden Gate had the Mac one only on ⌘Tab, in the Mac key profile;
  with it off Alt+Tab was always pixel. AltTab's mode (windows | apps) is now
  apart from the key whose release picks (modKey: meta for ⌘Tab, alt for
  Alt+Tab), for alt-watch.py and the host's fallback alike. niri's binds are
  unchanged.
- angelOS's Settings window has Quickshell's app id, so its .desktop entry was
  Quickshell's: the minimized window's corner in the Dock and the Mac switcher
  showed Quickshell's green gear and name. AppMenu.isShellSettings(w) (what
  AppMenu.shellSettings and the Dock's System Settings already checked) now
  decides there too: System Settings, preferences-system.

Checked on a live shell by hand (Alt+Tab in Golden Gate); qml-check: 710
files, 0 errors; tests/halo: 25 checks. scripts/test-ui.sh: 504 passed, 13
failed, none in Alt+Tab, the Dock or the Golden Gate pages (the game's
demon/exit scenes, OCR, the stream chat, rhythm, the setup wizard, a
TypeError in Network.qml); not compared with main.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
From a review of this PR: «System Settings» and preferences-system were written out in
the Dock (twice), Alt+Tab, the menu bar's app name and DockIcons. They are
AppMenu.shellSettingsName / shellSettingsIcon now, next to isShellSettings. Alt+Tab
builds Settings' entry and an app's with one push.

qml-check: 710 files, 0 errors.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
… Golden Gate; «System Settings» as an app

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@MixaDoDs

MixaDoDs commented Nov 5, 2026

Copy link
Copy Markdown
Owner

Вошло в angelOS вместе с остальными PR этой пачки — main 0821398 (обновление 05.11). Спасибо! / Shipped in main 0821398 (the 05.11 update). Thanks!

@MixaDoDs MixaDoDs closed this Nov 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants