diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 12f8fac..71c0ca3 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,7 +9,7 @@ permissions: env: DL_DIR: /srv/breadway-dl - ECOSYSTEM_DIR: /tmp/bread-ecosystem-ci + ECOSYSTEM_DIR: /home/breadway/Projects/bread-ecosystem jobs: build: @@ -41,8 +41,12 @@ jobs: - name: ensure bread-ecosystem run: | - rm -rf "${ECOSYSTEM_DIR}" - git clone https://github.com/Breadway/bread-ecosystem.git "${ECOSYSTEM_DIR}" + if [[ -d "${ECOSYSTEM_DIR}/.git" ]]; then + git -C "${ECOSYSTEM_DIR}" pull --ff-only + else + mkdir -p "$(dirname "${ECOSYSTEM_DIR}")" + git clone https://github.com/Breadway/bread-ecosystem.git "${ECOSYSTEM_DIR}" + fi - name: regenerate index.json run: bash "${ECOSYSTEM_DIR}/scripts/gen-index.sh" diff --git a/Cargo.lock b/Cargo.lock index 4f3f9c2..77c0113 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,8 +28,8 @@ checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] name = "bread-theme" -version = "0.2.3" -source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.2.8#77417d552130281ff787e07d52541eb25e9d533b" +version = "0.1.0" +source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.1.0#6b5f4f475f66a645b08cb865e6dda8228d23679b" dependencies = [ "dirs", "gtk4", @@ -39,7 +39,7 @@ dependencies = [ [[package]] name = "breadbox" -version = "0.2.4" +version = "0.2.1" dependencies = [ "bread-theme", "breadbox-shared", @@ -50,7 +50,7 @@ dependencies = [ [[package]] name = "breadbox-shared" -version = "0.2.4" +version = "0.2.1" dependencies = [ "serde", "serde_json", @@ -59,7 +59,7 @@ dependencies = [ [[package]] name = "breadbox-sync" -version = "0.2.4" +version = "0.2.1" dependencies = [ "breadbox-shared", "serde_json", diff --git a/breadbox-shared/Cargo.toml b/breadbox-shared/Cargo.toml index ec62ed1..a47dc19 100644 --- a/breadbox-shared/Cargo.toml +++ b/breadbox-shared/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "breadbox-shared" -version = "0.2.4" +version = "0.2.1" edition = "2021" license = "MIT" diff --git a/breadbox-sync/Cargo.toml b/breadbox-sync/Cargo.toml index bdcab16..93b7392 100644 --- a/breadbox-sync/Cargo.toml +++ b/breadbox-sync/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "breadbox-sync" -version = "0.2.4" +version = "0.2.1" edition = "2021" license = "MIT" diff --git a/breadbox/Cargo.toml b/breadbox/Cargo.toml index 9189abf..1de3b4e 100644 --- a/breadbox/Cargo.toml +++ b/breadbox/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "breadbox" -version = "0.2.4" +version = "0.2.1" edition = "2021" license = "MIT" @@ -9,7 +9,7 @@ name = "breadbox" path = "src/main.rs" [dependencies] -bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.2.8", features = ["gtk"] } +bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.1.0", features = ["gtk"] } breadbox-shared = { path = "../breadbox-shared" } gtk4 = { version = "0.11", features = ["v4_12"] } gtk4-layer-shell = "0.8" diff --git a/breadbox/src/main.rs b/breadbox/src/main.rs index 17f72ac..0fbab50 100644 --- a/breadbox/src/main.rs +++ b/breadbox/src/main.rs @@ -1,4 +1,4 @@ -use bread_theme::{hex_to_rgba, ink_on, load_palette, Palette}; +use bread_theme::{hex_to_rgba, load_palette, Palette}; use std::{ cell::RefCell, collections::HashMap, @@ -15,6 +15,7 @@ use breadbox_shared::{ config_dir, load_all_desktop_entries, Config, DesktopEntry, IconCache, LaunchHistory, }; use gtk4::{ + gdk::Display, glib, pango::EllipsizeMode, prelude::*, @@ -132,32 +133,26 @@ fn matches_term(field: &str, term: &str) -> bool { fn build_css(p: &Palette) -> String { let bg_panel = hex_to_rgba(&p.background, 0.60); - // breadbox-specific rules only — fonts, palette, and generic widgets come - // from the shared ecosystem stylesheet (applied first in connect_activate). - // Colour is set on each surface (panel, search box, hovered/selected row) so - // child labels inherit the legible ink for that background. `on_*` are - // luminance-picked black/white — the pywal hues are untouched. Without this a - // light `surface` slot makes the selected row's text vanish. format!( - "window {{ background-color: transparent; }}\ - .launcher-bg {{ background-color: {bg_panel}; color: {on_bg}; border-radius: 8px;\ + "* {{ font-family: 'Varela Round', sans-serif; font-size: 14px; }}\ + window {{ background-color: transparent; }}\ + .launcher-bg {{ background-color: {bg_panel}; border-radius: 8px;\ box-shadow: 0 8px 32px rgba(0,0,0,0.6); }}\ - searchentry {{ background-color: {surface}; color: {on_surface}; caret-color: {accent};\ + searchentry {{ background-color: {surface}; color: {fg}; caret-color: {accent};\ border: none; outline: none; box-shadow: none;\ padding: 12px 16px; border-radius: 6px 6px 0 0; }}\ listbox {{ background-color: transparent; padding: 4px; }}\ - row {{ padding: 8px 12px; color: {on_bg}; background-color: transparent;\ + row {{ padding: 8px 12px; color: {fg}; background-color: transparent;\ border-radius: 6px; }}\ - row:hover {{ background-color: {surface}; color: {on_surface}; }}\ - row:selected {{ background-color: {surface}; color: {on_surface}; }}\ + row:hover {{ background-color: {surface}; }}\ + row:selected {{ background-color: {surface}; }}\ .app-name {{ font-size: 14px; }}\ - .app-muted {{ opacity: 0.6; font-size: 12px; }}\ + .app-muted {{ color: {fg}; opacity: 0.6; font-size: 12px; }}\ image {{ margin-right: 8px; }}", - bg_panel = bg_panel, - surface = p.color0, - accent = p.color4, - on_bg = ink_on(&p.background), - on_surface = ink_on(&p.color0), + bg_panel = bg_panel, + surface = p.color0, + fg = p.foreground, + accent = p.color4, ) } @@ -295,7 +290,7 @@ fn get_row_entry(row: >k4::ListBoxRow) -> Option { } } -fn run_ui(entries: Vec, history: LaunchHistory) { +fn run_ui(entries: Vec, css: String, history: LaunchHistory) { let app = Application::builder() .application_id("com.breadway.breadbox") .build(); @@ -304,11 +299,14 @@ fn run_ui(entries: Vec, history: LaunchHistory) { let query_rc: Rc> = Rc::new(RefCell::new(String::new())); app.connect_activate(move |app| { - // Shared ecosystem base (fonts, palette, generic widgets) first, then - // breadbox-specific CSS layered on top — both hot-reload on - // `bread-theme reload` (the closure re-reads the pywal palette). - bread_theme::gtk::apply_shared(); - bread_theme::gtk::apply_app_css(|| build_css(&load_palette())); + // Base CSS + let provider = CssProvider::new(); + provider.load_from_string(&css); + gtk4::style_context_add_provider_for_display( + &Display::default().expect("no display"), + &provider, + gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION, + ); // User CSS override { @@ -564,5 +562,8 @@ fn main() { let manifest = load_manifest(); let entries = load_sorted_entries(&manifest, &priority, &history); - run_ui(entries, history); + let palette = load_palette(); + let css = build_css(&palette); + + run_ui(entries, css, history); } diff --git a/packaging/arch/PKGBUILD b/packaging/arch/PKGBUILD index 1df5ba5..bca6391 100644 --- a/packaging/arch/PKGBUILD +++ b/packaging/arch/PKGBUILD @@ -10,7 +10,7 @@ license=('MIT') # Some Rust deps (ring/mlua) build vendored C/asm into static archives; makepkg's # default -flto=auto emits GCC LTO bitcode the Rust (lld) link cannot read, # causing undefined-symbol errors. Disable LTO. -options=(!lto !debug) +options=(!lto) depends=('gtk4' 'gtk4-layer-shell' 'librsvg') optdepends=( 'hyprland: window and workspace integration'