Breadway/breadbar
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Merge feature/wifi-add-dialog-csd: proper CSD for the wifi add-network dialog
All checks were successful
dev release / build (push) Successful in 4m24s
Details

Browse source
This commit is contained in:
Breadway 2026-07-30 19:05:22 +08:00
commit 1752db84c8
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main.rs
View file

@ -1350,6 +1350,15 @@ fn show_add_network_dialog(anchor: &impl IsA<gtk4::Widget>, ssid: String, on_bui
dialog.set_title(Some(&format!("Add “{ssid}”")));
dialog.set_resizable(false);
dialog.add_css_class("wifi-add-dialog");
// A bare gtk4::Window with no titlebar set falls back to GTK's own
// minimal CSD: a flat bar with plain system-font title text and no
// rounding — which is what actually made this look like a stray window
// from a different decade next to the rest of the (rounded, borderless,
// shadowed) ecosystem. A real HeaderBar picks up the window's own title
// automatically and gets the same `.wifi-add-dialog` theming below.
let header = gtk4::HeaderBar::new();
header.set_show_title_buttons(true);
dialog.set_titlebar(Some(&header));
if let Some(root) = anchor.root() {
if let Ok(win) = root.downcast::<gtk4::Window>() {
dialog.set_transient_for(Some(&win));
@ -1375,7 +1384,14 @@ fn show_add_network_dialog(anchor: &impl IsA<gtk4::Widget>, ssid: String, on_bui
btn_row.set_halign(gtk4::Align::End);
let cancel_btn = gtk4::Button::with_label("Cancel");
let connect_btn = gtk4::Button::with_label("Connect");
connect_btn.add_css_class("suggested-action");
// Not "suggested-action" — GTK4's own bundled theme special-cases that
// class for a newer native OS-accent-colour feature that isn't a normal
// CSS rule at all, and simply doesn't lose to any `background-color`
// override this stylesheet adds, however specific the selector (already
// confirmed empirically: adding a much more specific override rule had
// zero effect). "confirm-button" is the same ecosystem-wide accent
// button convention breadman/breadpad already use successfully.
connect_btn.add_css_class("confirm-button");
btn_row.append(&cancel_btn);
btn_row.append(&connect_btn);
body.append(&btn_row);

11
src/theme.rs
View file

@ -48,7 +48,6 @@ fn load_css() -> String {
progressbar.osd-bar {{ min-height: 6px; }}\
progressbar.osd-bar trough {{ background-image: none; background-color: {trough}; border-radius: 3px; min-height: 6px; }}\
progressbar.osd-bar trough progress {{ background-image: none; background-color: {accent}; border-radius: 3px; min-height: 6px; }}\
.clickable {{ cursor: pointer; }}\
.wifi-pair {{ border-radius: {radius_sm}; padding: 0 2px; }}\
.wifi-pair:hover {{ background: alpha({on_bg}, 0.12); }}\
.wifi-popover-inner {{ min-width: 200px; padding: {pad}; }}\
@ -68,8 +67,14 @@ fn load_css() -> String {
.wifi-popover-row-active {{ color: {accent}; }}\
.wifi-popover-row-unsaved {{ opacity: 0.4; }}\
.wifi-popover-loading {{ opacity: 0.5; padding: 8px; }}\
window.wifi-add-dialog {{ background-color: {bg_rgba}; color: {on_bg}; min-width: 240px; }}\
.media-widget {{ border-radius: {radius_sm}; padding: 0 6px; cursor: pointer; }}\
window.wifi-add-dialog {{ background-color: {bg_rgba}; color: {on_bg}; min-width: 240px;\
border-radius: {radius}; }}\
window.wifi-add-dialog headerbar {{ background-color: {bg_rgba}; color: {on_bg};\
border-top-left-radius: {radius}; border-top-right-radius: {radius};\
border-bottom: 1px solid alpha({on_bg}, 0.08); box-shadow: none; }}\
.confirm-button {{ background-color: @accent; color: @on-accent; }}\
.confirm-button:hover {{ background-color: alpha(@accent, 0.85); }}\
.media-widget {{ border-radius: {radius_sm}; padding: 0 6px; }}\
.media-widget:hover {{ background: alpha({on_bg}, 0.10); }}\
.media-indicator {{ font-size: 11px; opacity: 0.7; margin-right: 2px; }}\
.media-track-lbl {{ font-size: 12px; }}\