Skip to content

Golden Gate: столы в обзоре niri на стеклянных карточках / the desks in niri's overview on glass cards - #153

Closed
Alastor1991 wants to merge 3 commits into
MixaDoDs:mainfrom
Alastor1991:mac-overview-glass
Closed

Alastor1991 wants to merge 3 commits into
MixaDoDs:mainfrom
Alastor1991:mac-overview-glass

Conversation

@Alastor1991

@Alastor1991 Alastor1991 commented Nov 2, 2026 •

Copy link
Copy Markdown
Contributor

Зачем

В обзоре niri (жест на тачпаде, клавиша обзора) самих столов не видно. Столы прозрачные (cfg/layout.kdl, background-color "transparent"), обои лежат в backdrop, и на одних общих обоях висят только окна столов. Где кончается один стол и начинается другой, не понять.

Что сделано

Пока открыт обзор, слой angelos-desktop, который niri рисует внутри каждого стола и уменьшает вместе с ним, несёт на весь стол карточку MacGlass, а niri размывает под ней обои (BackgroundEffect). При закрытии обзора карточка гаснет раньше, чем стол вернётся к полному размеру. Обои остаются в backdrop, потому что на их неподвижности держатся переходы между столами и виджеты стола. Форк niri менять не нужно.

Настройки → Golden Gate → Окна → «Рабочие столы в обзоре» (mac.overviewDesks): стекло (по умолчанию) или прозрачные (как рисует niri). Ключ добавлен в choices и в сброс темы, слова для поиска в settings-keywords.json, описание в GOLDEN-GATE.md.

Карточка – отдельный компонент modules/mac/MacOverviewCard.qml, в Background.qml остаются только она и область размытия. Масштаб обзора, под который рисуются скругление и край карточки, задан явно в templates/niri-mac.kdl (zoom 0.5) и читается из GoldenGate.overviewZoom.

С другими PR

Строки choices, _watched и themeKeys в GoldenGate.qml меняют и #141, #149, #152. Пункт настроек стоит в конце группы «Окна», после «Зелёной кнопки» из #149.

Проверено

Во вложенном niri с angel-niri: карточки в обзоре, после закрытия обзора их нет, режим «Прозрачные» как раньше, поиск по слову «обзор». scripts/qml-check.sh: 719 файлов, 0 ошибок.

EN

In niri's overview (the touchpad gesture, the overview key) the desks themselves are not to be seen: the workspaces are clear (cfg/layout.kdl, background-color "transparent") and the wallpaper is in the backdrop, so only their windows float over one big wallpaper.

While the overview is open, angelos-desktop, the layer niri draws inside every workspace and zooms out with it, carries a MacGlass card over the whole desk, and niri blurs the wallpaper under it (BackgroundEffect). It fades out as the overview closes, before the desk is back at full size. The wallpaper stays in the backdrop: the workspace switches and the desktop widgets rest on it not moving. No change to angel-niri.

Settings → Golden Gate → Windows → "Desktops in the overview" (mac.overviewDesks): glass (the default) or clear (as niri draws them); in the skin's choices and reset lists, the settings search words and GOLDEN-GATE.md. The card is modules/mac/MacOverviewCard.qml; the overview zoom its edge and corners are drawn for is set in templates/niri-mac.kdl (zoom 0.5) and read from GoldenGate.overviewZoom. #141, #149 and #152 touch the same GoldenGate.qml lines; the row goes at the end of the Windows group, after #149's green light.

Checked in a nested niri with angel-niri: the cards, gone after the overview closes, clear as before, the settings search. qml-check: 719 files, 0 errors.

🤖 Generated with Claude Code

Alastor1991 and others added 2 commits November 2, 2026 13:05
…Windows)

In niri's overview (the touchpad gesture, the overview key) the desks
themselves were not to be seen: the workspaces are clear (cfg/layout.kdl,
background-color "transparent") and the wallpaper is in the backdrop, so only
their windows floated over one big wallpaper.

While the overview is open, angelos-desktop, the layer niri draws inside every
workspace and zooms out with it, carries a MacGlass card over the whole desk,
and niri blurs the wallpaper under it (BackgroundEffect). It fades out as the
overview closes, before the desk is back at full size. The wallpaper stays in
the backdrop: the workspace switches and the desktop widgets rest on it not
moving.

Settings → Golden Gate → Windows → "Desktops in the overview"
(mac.overviewDesks): glass (the default) | clear (as niri draws them). In the
skin's choices and reset lists, the settings search words and GOLDEN-GATE.md.

Checked in a nested niri with angel-niri: the cards, gone after the overview
closes, clear as before, the settings search. qml-check: 719 files, 0 errors.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
…ere it is read

From a review of this PR:
- the card is modules/mac/MacOverviewCard.qml (the Mac part out of the desktop layer every
  skin shares); Background keeps the card and its blur region;
- the overview zoom the card's edge and corners are drawn for is set in
  templates/niri-mac.kdl (zoom 0.5) and read from GoldenGate.overviewZoom, no longer
  niri's default assumed;
- mac.overviewDesks sits with the windows' keys in the schema.

qml-check: 720 files, 0 errors; the Golden Gate system tests pass.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
MixaDoDs pushed a commit that referenced this pull request Nov 3, 2026
… one a line

Every new Golden Gate setting touched two one-line lists in services/GoldenGate.qml:
_watched (what triggers sanitize) and themeKeys (what «Reset the theme» puts back). So
any two PRs adding a setting conflicted there (#141, #145, #149, #152, #153 do, pairwise).

- _watched is built from the keys of limits and choices: a key with a range or a list
  of choices is watched by being there (lightFrom and darkFrom, in limits but missing
  from the old list, are watched now too);
- themeKeys, limits and choices hold one key a line, in order, so new settings land on
  lines of their own.

No change in behaviour otherwise. qml-check: 719 files, 0 errors; the Golden Gate system
tests pass.

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