Compare commits
No commits in common. "main" and "v0.2.2" have entirely different histories.
7 changed files with 44 additions and 39 deletions
10
.github/workflows/release.yml
vendored
10
.github/workflows/release.yml
vendored
|
|
@ -9,7 +9,7 @@ permissions:
|
||||||
|
|
||||||
env:
|
env:
|
||||||
DL_DIR: /srv/breadway-dl
|
DL_DIR: /srv/breadway-dl
|
||||||
ECOSYSTEM_DIR: /tmp/bread-ecosystem-ci
|
ECOSYSTEM_DIR: /home/breadway/Projects/bread-ecosystem
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|
@ -41,8 +41,12 @@ jobs:
|
||||||
|
|
||||||
- name: ensure bread-ecosystem
|
- name: ensure bread-ecosystem
|
||||||
run: |
|
run: |
|
||||||
rm -rf "${ECOSYSTEM_DIR}"
|
if [[ -d "${ECOSYSTEM_DIR}/.git" ]]; then
|
||||||
git clone https://github.com/Breadway/bread-ecosystem.git "${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}"
|
||||||
|
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
10
Cargo.lock
generated
|
|
@ -28,8 +28,8 @@ checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "bread-theme"
|
name = "bread-theme"
|
||||||
version = "0.2.3"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.2.8#77417d552130281ff787e07d52541eb25e9d533b"
|
source = "git+https://github.com/Breadway/bread-ecosystem?tag=v0.1.0#6b5f4f475f66a645b08cb865e6dda8228d23679b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dirs",
|
"dirs",
|
||||||
"gtk4",
|
"gtk4",
|
||||||
|
|
@ -39,7 +39,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "breadbox"
|
name = "breadbox"
|
||||||
version = "0.2.4"
|
version = "0.2.1"
|
||||||
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.4"
|
version = "0.2.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
|
@ -59,7 +59,7 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "breadbox-sync"
|
name = "breadbox-sync"
|
||||||
version = "0.2.4"
|
version = "0.2.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"breadbox-shared",
|
"breadbox-shared",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "breadbox-shared"
|
name = "breadbox-shared"
|
||||||
version = "0.2.4"
|
version = "0.2.1"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "breadbox-sync"
|
name = "breadbox-sync"
|
||||||
version = "0.2.4"
|
version = "0.2.1"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
[package]
|
[package]
|
||||||
name = "breadbox"
|
name = "breadbox"
|
||||||
version = "0.2.4"
|
version = "0.2.1"
|
||||||
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.2.8", features = ["gtk"] }
|
bread-theme = { git = "https://github.com/Breadway/bread-ecosystem", tag = "v0.1.0", 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"
|
||||||
|
|
|
||||||
|
|
@ -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::{
|
use std::{
|
||||||
cell::RefCell,
|
cell::RefCell,
|
||||||
collections::HashMap,
|
collections::HashMap,
|
||||||
|
|
@ -15,6 +15,7 @@ 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::*,
|
||||||
|
|
@ -132,32 +133,26 @@ 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!(
|
||||||
"window {{ background-color: transparent; }}\
|
"* {{ font-family: 'Varela Round', sans-serif; font-size: 14px; }}\
|
||||||
.launcher-bg {{ background-color: {bg_panel}; color: {on_bg}; border-radius: 8px;\
|
window {{ background-color: transparent; }}\
|
||||||
|
.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: {on_surface}; caret-color: {accent};\
|
searchentry {{ background-color: {surface}; color: {fg}; 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: {on_bg}; background-color: transparent;\
|
row {{ padding: 8px 12px; color: {fg}; background-color: transparent;\
|
||||||
border-radius: 6px; }}\
|
border-radius: 6px; }}\
|
||||||
row:hover {{ background-color: {surface}; color: {on_surface}; }}\
|
row:hover {{ background-color: {surface}; }}\
|
||||||
row:selected {{ background-color: {surface}; color: {on_surface}; }}\
|
row:selected {{ background-color: {surface}; }}\
|
||||||
.app-name {{ font-size: 14px; }}\
|
.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; }}",
|
image {{ margin-right: 8px; }}",
|
||||||
bg_panel = bg_panel,
|
bg_panel = bg_panel,
|
||||||
surface = p.color0,
|
surface = p.color0,
|
||||||
accent = p.color4,
|
fg = p.foreground,
|
||||||
on_bg = ink_on(&p.background),
|
accent = p.color4,
|
||||||
on_surface = ink_on(&p.color0),
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -295,7 +290,7 @@ fn get_row_entry(row: >k4::ListBoxRow) -> Option<DesktopEntry> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn run_ui(entries: Vec<DesktopEntry>, history: LaunchHistory) {
|
fn run_ui(entries: Vec<DesktopEntry>, css: String, history: LaunchHistory) {
|
||||||
let app = Application::builder()
|
let app = Application::builder()
|
||||||
.application_id("com.breadway.breadbox")
|
.application_id("com.breadway.breadbox")
|
||||||
.build();
|
.build();
|
||||||
|
|
@ -304,11 +299,14 @@ fn run_ui(entries: Vec<DesktopEntry>, 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| {
|
||||||
// Shared ecosystem base (fonts, palette, generic widgets) first, then
|
// Base CSS
|
||||||
// breadbox-specific CSS layered on top — both hot-reload on
|
let provider = CssProvider::new();
|
||||||
// `bread-theme reload` (the closure re-reads the pywal palette).
|
provider.load_from_string(&css);
|
||||||
bread_theme::gtk::apply_shared();
|
gtk4::style_context_add_provider_for_display(
|
||||||
bread_theme::gtk::apply_app_css(|| build_css(&load_palette()));
|
&Display::default().expect("no display"),
|
||||||
|
&provider,
|
||||||
|
gtk4::STYLE_PROVIDER_PRIORITY_APPLICATION,
|
||||||
|
);
|
||||||
|
|
||||||
// User CSS override
|
// User CSS override
|
||||||
{
|
{
|
||||||
|
|
@ -564,5 +562,8 @@ 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);
|
||||||
|
|
||||||
run_ui(entries, history);
|
let palette = load_palette();
|
||||||
|
let css = build_css(&palette);
|
||||||
|
|
||||||
|
run_ui(entries, css, history);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ license=('MIT')
|
||||||
# Some Rust deps (ring/mlua) build vendored C/asm into static archives; makepkg's
|
# 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,
|
# default -flto=auto emits GCC LTO bitcode the Rust (lld) link cannot read,
|
||||||
# causing undefined-symbol errors. Disable LTO.
|
# causing undefined-symbol errors. Disable LTO.
|
||||||
options=(!lto !debug)
|
options=(!lto)
|
||||||
depends=('gtk4' 'gtk4-layer-shell' 'librsvg')
|
depends=('gtk4' 'gtk4-layer-shell' 'librsvg')
|
||||||
optdepends=(
|
optdepends=(
|
||||||
'hyprland: window and workspace integration'
|
'hyprland: window and workspace integration'
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue