Compare commits

...

6 commits
v0.2.3 ... main

Author SHA1 Message Date
Breadway
7ece4fd762 CI: use /tmp for ecosystem clone, avoid permissions conflict
All checks were successful
Mirror to GitHub / mirror (push) Successful in 2s
2026-06-19 08:38:38 +08:00
Breadway
a33e979e5e Bump bread-theme to v0.2.8 (live-reload fix)
Some checks failed
Mirror to GitHub / mirror (push) Successful in 2s
Build and publish package / package (push) Failing after 2m39s
2026-06-17 12:55:52 +08:00
Breadway
83b9fd908e Fix illegible text on light pywal palettes + hot-reload
Use bread-theme 0.2.7's luminance-picked ink (@on-*): a selected/hovered row set
its background to `surface` but kept the pywal foreground, so the highlighted
item went unreadable when `surface` came out light. Colour is now set per surface
(panel, search box, row states) and labels inherit it.

Switch to bread_theme::gtk::apply_app_css so breadbox picks up `bread-theme
reload` (and rebuilds from the fresh palette on each launch).
2026-06-17 12:41:30 +08:00
Breadway
8c64ec1bf2 Release 0.2.4: shared bread-theme stylesheet
Some checks failed
Mirror to GitHub / mirror (push) Successful in 2s
Build and publish package / package (push) Failing after 3m13s
2026-06-16 18:32:48 +08:00
Breadway
732c3126ae Release 0.2.2: shared bread-theme stylesheet
Pin bread-theme v0.2.6 and load the shared ecosystem stylesheet.
2026-06-16 18:32:12 +08:00
Breadway
d464689a18 theme: load the shared bread-theme stylesheet
Apply bread_theme::gtk::apply_shared() before breadbox's own CSS so fonts,
palette, and generic widgets come from the shared ecosystem stylesheet. Keep
only launcher-specific rules (launcher-bg, searchentry, rows). Bump bread-theme
dep to v0.2.6.
2026-06-16 16:57:12 +08:00
6 changed files with 38 additions and 43 deletions

View file

@ -9,7 +9,7 @@ permissions:
env: env:
DL_DIR: /srv/breadway-dl DL_DIR: /srv/breadway-dl
ECOSYSTEM_DIR: /home/breadway/Projects/bread-ecosystem ECOSYSTEM_DIR: /tmp/bread-ecosystem-ci
jobs: jobs:
build: build:
@ -41,12 +41,8 @@ jobs:
- name: ensure bread-ecosystem - name: ensure bread-ecosystem
run: | run: |
if [[ -d "${ECOSYSTEM_DIR}/.git" ]]; then rm -rf "${ECOSYSTEM_DIR}"
git -C "${ECOSYSTEM_DIR}" pull --ff-only
else
mkdir -p "$(dirname "${ECOSYSTEM_DIR}")"
git clone https://github.com/Breadway/bread-ecosystem.git "${ECOSYSTEM_DIR}" git clone https://github.com/Breadway/bread-ecosystem.git "${ECOSYSTEM_DIR}"
fi
- name: regenerate index.json - name: regenerate index.json
run: bash "${ECOSYSTEM_DIR}/scripts/gen-index.sh" run: bash "${ECOSYSTEM_DIR}/scripts/gen-index.sh"

10
Cargo.lock generated
View file

@ -28,8 +28,8 @@ checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
[[package]] [[package]]
name = "bread-theme" name = "bread-theme"
version = "0.1.0" version = "0.2.3"
source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.1.0#6b5f4f475f66a645b08cb865e6dda8228d23679b" source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.2.8#77417d552130281ff787e07d52541eb25e9d533b"
dependencies = [ dependencies = [
"dirs", "dirs",
"gtk4", "gtk4",
@ -39,7 +39,7 @@ dependencies = [
[[package]] [[package]]
name = "breadbox" name = "breadbox"
version = "0.2.1" version = "0.2.4"
dependencies = [ dependencies = [
"bread-theme", "bread-theme",
"breadbox-shared", "breadbox-shared",
@ -50,7 +50,7 @@ dependencies = [
[[package]] [[package]]
name = "breadbox-shared" name = "breadbox-shared"
version = "0.2.1" version = "0.2.4"
dependencies = [ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
@ -59,7 +59,7 @@ dependencies = [
[[package]] [[package]]
name = "breadbox-sync" name = "breadbox-sync"
version = "0.2.1" version = "0.2.4"
dependencies = [ dependencies = [
"breadbox-shared", "breadbox-shared",
"serde_json", "serde_json",

View file

@ -1,6 +1,6 @@
[package] [package]
name = "breadbox-shared" name = "breadbox-shared"
version = "0.2.1" version = "0.2.4"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View file

@ -1,6 +1,6 @@
[package] [package]
name = "breadbox-sync" name = "breadbox-sync"
version = "0.2.1" version = "0.2.4"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

View file

@ -1,6 +1,6 @@
[package] [package]
name = "breadbox" name = "breadbox"
version = "0.2.1" version = "0.2.4"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"
@ -9,7 +9,7 @@ name = "breadbox"
path = "src/main.rs" path = "src/main.rs"
[dependencies] [dependencies]
bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.1.0", features = ["gtk"] } bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.2.8", features = ["gtk"] }
breadbox-shared = { path = "../breadbox-shared" } breadbox-shared = { path = "../breadbox-shared" }
gtk4 = { version = "0.11", features = ["v4_12"] } gtk4 = { version = "0.11", features = ["v4_12"] }
gtk4-layer-shell = "0.8" gtk4-layer-shell = "0.8"

View file

@ -1,4 +1,4 @@
use bread_theme::{hex_to_rgba, load_palette, Palette}; use bread_theme::{hex_to_rgba, ink_on, load_palette, Palette};
use std::{ use std::{
cell::RefCell, cell::RefCell,
collections::HashMap, collections::HashMap,
@ -15,7 +15,6 @@ use breadbox_shared::{
config_dir, load_all_desktop_entries, Config, DesktopEntry, IconCache, LaunchHistory, config_dir, load_all_desktop_entries, Config, DesktopEntry, IconCache, LaunchHistory,
}; };
use gtk4::{ use gtk4::{
gdk::Display,
glib, glib,
pango::EllipsizeMode, pango::EllipsizeMode,
prelude::*, prelude::*,
@ -133,26 +132,32 @@ fn matches_term(field: &str, term: &str) -> bool {
fn build_css(p: &Palette) -> String { fn build_css(p: &Palette) -> String {
let bg_panel = hex_to_rgba(&p.background, 0.60); 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!( format!(
"* {{ font-family: 'Varela Round', sans-serif; font-size: 14px; }}\ "window {{ background-color: transparent; }}\
window {{ background-color: transparent; }}\ .launcher-bg {{ background-color: {bg_panel}; color: {on_bg}; border-radius: 8px;\
.launcher-bg {{ background-color: {bg_panel}; border-radius: 8px;\
box-shadow: 0 8px 32px rgba(0,0,0,0.6); }}\ box-shadow: 0 8px 32px rgba(0,0,0,0.6); }}\
searchentry {{ background-color: {surface}; color: {fg}; caret-color: {accent};\ searchentry {{ background-color: {surface}; color: {on_surface}; caret-color: {accent};\
border: none; outline: none; box-shadow: none;\ border: none; outline: none; box-shadow: none;\
padding: 12px 16px; border-radius: 6px 6px 0 0; }}\ padding: 12px 16px; border-radius: 6px 6px 0 0; }}\
listbox {{ background-color: transparent; padding: 4px; }}\ listbox {{ background-color: transparent; padding: 4px; }}\
row {{ padding: 8px 12px; color: {fg}; background-color: transparent;\ row {{ padding: 8px 12px; color: {on_bg}; background-color: transparent;\
border-radius: 6px; }}\ border-radius: 6px; }}\
row:hover {{ background-color: {surface}; }}\ row:hover {{ background-color: {surface}; color: {on_surface}; }}\
row:selected {{ background-color: {surface}; }}\ row:selected {{ background-color: {surface}; color: {on_surface}; }}\
.app-name {{ font-size: 14px; }}\ .app-name {{ font-size: 14px; }}\
.app-muted {{ color: {fg}; opacity: 0.6; font-size: 12px; }}\ .app-muted {{ opacity: 0.6; font-size: 12px; }}\
image {{ margin-right: 8px; }}", image {{ margin-right: 8px; }}",
bg_panel = bg_panel, bg_panel = bg_panel,
surface = p.color0, surface = p.color0,
fg = p.foreground,
accent = p.color4, accent = p.color4,
on_bg = ink_on(&p.background),
on_surface = ink_on(&p.color0),
) )
} }
@ -290,7 +295,7 @@ fn get_row_entry(row: &gtk4::ListBoxRow) -> Option<DesktopEntry> {
} }
} }
fn run_ui(entries: Vec<DesktopEntry>, css: String, history: LaunchHistory) { fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {
let app = Application::builder() let app = Application::builder()
.application_id("com.breadway.breadbox") .application_id("com.breadway.breadbox")
.build(); .build();
@ -299,14 +304,11 @@ fn run_ui(entries: Vec<DesktopEntry>, css: String, history: LaunchHistory) {
let query_rc: Rc<RefCell<String>> = Rc::new(RefCell::new(String::new())); let query_rc: Rc<RefCell<String>> = Rc::new(RefCell::new(String::new()));
app.connect_activate(move |app| { app.connect_activate(move |app| {
// Base CSS // Shared ecosystem base (fonts, palette, generic widgets) first, then
let provider = CssProvider::new(); // breadbox-specific CSS layered on top — both hot-reload on
provider.load_from_string(&css); // `bread-theme reload` (the closure re-reads the pywal palette).
gtk4::style_context_add_provider_for_display( bread_theme::gtk::apply_shared();
&Display::default().expect("no display"), bread_theme::gtk::apply_app_css(|| build_css(&load_palette()));
&provider,
gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION,
);
// User CSS override // User CSS override
{ {
@ -562,8 +564,5 @@ fn main() {
let manifest = load_manifest(); let manifest = load_manifest();
let entries = load_sorted_entries(&manifest, &priority, &history); let entries = load_sorted_entries(&manifest, &priority, &history);
let palette = load_palette(); run_ui(entries, history);
let css = build_css(&palette);
run_ui(entries, css, history);
} }