mirror of
https://github.com/Zedfrigg/ironbar.git
synced 2025-08-17 14:51:04 +02:00
feat: fully implement orientation/justify options
Adds `orientation` and `justify` options to all modules and custom widgets where it makes sense to do so. Any modules without support document this. Widgets fully document the options inline where present for now. Resolves #296
This commit is contained in:
parent
0855039bce
commit
c20feb77b7
29 changed files with 317 additions and 161 deletions
|
@ -9,7 +9,7 @@ use crate::{read_lock, try_send};
|
|||
use glib::Propagation;
|
||||
use gtk::gdk::{BUTTON_MIDDLE, BUTTON_PRIMARY};
|
||||
use gtk::prelude::*;
|
||||
use gtk::{Button, IconTheme, Image, Label, Orientation};
|
||||
use gtk::{Align, Button, IconTheme, Image, Justification, Label, Orientation};
|
||||
use indexmap::IndexMap;
|
||||
use std::ops::Deref;
|
||||
use std::rc::Rc;
|
||||
|
@ -156,6 +156,9 @@ pub struct AppearanceOptions {
|
|||
pub show_icons: bool,
|
||||
pub icon_size: i32,
|
||||
pub truncate: TruncateMode,
|
||||
pub orientation: Orientation,
|
||||
pub angle: f64,
|
||||
pub justify: Justification,
|
||||
}
|
||||
|
||||
impl ItemButton {
|
||||
|
@ -167,11 +170,13 @@ impl ItemButton {
|
|||
tx: &Sender<ModuleUpdateEvent<LauncherUpdate>>,
|
||||
controller_tx: &Sender<ItemEvent>,
|
||||
) -> Self {
|
||||
let button = ImageTextButton::new();
|
||||
let button = ImageTextButton::new(appearance.orientation);
|
||||
|
||||
if appearance.show_names {
|
||||
button.label.set_label(&item.name);
|
||||
button.label.truncate(appearance.truncate);
|
||||
button.label.set_angle(appearance.angle);
|
||||
button.label.set_justify(appearance.justify);
|
||||
}
|
||||
|
||||
if appearance.show_icons {
|
||||
|
@ -329,18 +334,20 @@ pub struct ImageTextButton {
|
|||
}
|
||||
|
||||
impl ImageTextButton {
|
||||
pub(crate) fn new() -> Self {
|
||||
pub(crate) fn new(orientation: Orientation) -> Self {
|
||||
let button = Button::new();
|
||||
let container = gtk::Box::new(Orientation::Horizontal, 0);
|
||||
let container = gtk::Box::new(orientation, 0);
|
||||
|
||||
let label = Label::new(None);
|
||||
let image = Image::new();
|
||||
|
||||
button.add(&container);
|
||||
|
||||
container.add(&image);
|
||||
container.add(&label);
|
||||
|
||||
button.add(&container);
|
||||
container.set_halign(Align::Center);
|
||||
container.set_valign(Align::Center);
|
||||
|
||||
ImageTextButton {
|
||||
button,
|
||||
label,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue