Skip to content

fix(dfm,theme): silence GTK markup + Adwaita dark-theme warnings #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VictorGSchneider merged 2 commits into from
May 16, 2026
+15 −5
Merged

fix(dfm,theme): silence GTK markup + Adwaita dark-theme warnings #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a094f84
fix(dfm): escape Pango markup in row titles from config comments
claude May 16, 2026
dcac1e4
fix(theme): drop deprecated prefer-dark-theme from gtk-4.0 settings
claude May 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions scripts/stoa-dfm/dfm/ui/window_config_page_fields.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@
import gi
gi.require_version("Gtk", "4.0")
gi.require_version("Adw", "1")
from gi.repository import Gtk, Adw, Gdk
from gi.repository import Gtk, Adw, Gdk, GLib

from dfm.core.parser import ConfigField, FieldType, ParsedConfig, BOOL_TRUE
from dfm.core.scanner import DotfileEntry


def _esc(text: str) -> str:
# Adw row titles/subtitles parse Pango markup; escape user-supplied
# text from config files so '&' and '<' don't blow up the parser.
return GLib.markup_escape_text(text or "")


def auto_range(key: str, current_val: float) -> tuple[float, float, float]:
"""Pick a reasonable (lo, hi, step) for a numeric key."""
key_lower = key.lower()
Expand Down Expand Up @@ -43,9 +49,9 @@ def create_field_row(builder, field: ConfigField, parsed: ParsedConfig,
entry: DotfileEntry) -> Adw.ActionRow | None:
"""Create a row widget appropriate for the field's type."""
ftype = field.field_type if hasattr(field, "field_type") else getattr(field, "type", None)
key = field.key
key = _esc(field.key)
value = field.value
description = getattr(field, "comment", "") or ""
description = _esc(getattr(field, "comment", "") or "")

if ftype == FieldType.COMMENT:
return None
Expand Down
2 changes: 1 addition & 1 deletion scripts/stoa-dfm/dfm/ui/window_config_page_sections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ def build_deps(entry: DotfileEntry) -> Gtk.Widget | None:


def build_notes(builder, entry: DotfileEntry) -> Gtk.Widget:
group = Adw.PreferencesGroup(title="Notes & Tags")
group = Adw.PreferencesGroup(title="Notes &amp; Tags")

note = get_note(entry.name)
note_text = note.note if note else ""
Expand Down
6 changes: 5 additions & 1 deletion theme/gtk-4.0/settings.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,8 @@ gtk-icon-theme-name = Colloid-dark
gtk-cursor-theme-name = Colloid-cursors
gtk-cursor-theme-size = 24
gtk-font-name = EB Garamond 11
gtk-application-prefer-dark-theme = true
# Dark mode for GTK4 / libadwaita is driven by
# org.gnome.desktop.interface color-scheme = 'prefer-dark', set by
# theme/pacman-hooks/stoa-theme-enforce. The legacy
# gtk-application-prefer-dark-theme key is unsupported under libadwaita
# (emits an Adwaita-WARNING on every app launch) and was removed.
Loading