zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-03 19:51:03 +02:00
Code Activity

feat(custom): slider widget

Browse source 
Resolves partially #68.
This commit is contained in:
Jake Stanger 2023-04-09 22:42:35 +01:00
parent e928b30f99
commit dfe1964abf
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
14 changed files with 245 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/popup.rs
View file

@ -4,7 +4,7 @@ use crate::config::BarPosition;
use crate::modules::ModuleInfo;
use gtk::gdk::Monitor;
use gtk::prelude::*;
use gtk::{ApplicationWindow, Button, Orientation};
use gtk::{ApplicationWindow, Orientation};
use tracing::debug;
#[derive(Debug, Clone)]
@ -133,7 +133,7 @@ impl Popup {
}
/// Shows the popup
pub fn show(&self, geometry: ButtonGeometry) {
pub fn show(&self, geometry: WidgetGeometry) {
self.window.show();
self.set_pos(geometry);
}
@ -150,7 +150,7 @@ impl Popup {
/// Sets the popup's X/Y position relative to the left or border of the screen
/// (depending on orientation).
fn set_pos(&self, geometry: ButtonGeometry) {
fn set_pos(&self, geometry: WidgetGeometry) {
let orientation = self.pos.get_orientation();
let mon_workarea = self.monitor.workarea();
@ -190,14 +190,17 @@ impl Popup {
/// Gets the absolute X position of the button
/// and its width / height (depending on orientation).
pub fn button_pos(button: &Button, orientation: Orientation) -> ButtonGeometry {
let button_size = if orientation == Orientation::Horizontal {
button.allocation().width()
pub fn widget_geometry<W>(widget: &W, orientation: Orientation) -> WidgetGeometry
where
W: IsA<gtk::Widget>,
{
let widget_size = if orientation == Orientation::Horizontal {
widget.allocation().width()
} else {
button.allocation().height()
widget.allocation().height()
};
let top_level = button.toplevel().expect("Failed to get top-level widget");
let top_level = widget.toplevel().expect("Failed to get top-level widget");
let bar_size = if orientation == Orientation::Horizontal {
top_level.allocation().width()
@ -205,26 +208,26 @@ impl Popup {
top_level.allocation().height()
};
let (button_x, button_y) = button
let (widget_x, widget_y) = widget
.translate_coordinates(&top_level, 0, 0)
.unwrap_or((0, 0));
let button_pos = if orientation == Orientation::Horizontal {
button_x
let widget_pos = if orientation == Orientation::Horizontal {
widget_x
} else {
button_y
widget_y
};
ButtonGeometry {
position: button_pos,
size: button_size,
WidgetGeometry {
position: widget_pos,
size: widget_size,
bar_size,
}
}
}
#[derive(Debug, Copy, Clone)]
pub struct ButtonGeometry {
pub struct WidgetGeometry {
position: i32,
size: i32,
bar_size: i32,