1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-07-01 10:41:03 +02:00

refactor: rename get_orientation method to orientation

This commit is contained in:
Jake Stanger 2024-02-18 14:54:17 +00:00
parent 0cc1f79be0
commit a55ba8c523
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
9 changed files with 12 additions and 14 deletions

View file

@ -60,7 +60,7 @@ impl Bar {
window.set_widget_name(&name); window.set_widget_name(&name);
let position = config.position; let position = config.position;
let orientation = position.get_orientation(); let orientation = position.orientation();
let content = gtk::Box::builder() let content = gtk::Box::builder()
.orientation(orientation) .orientation(orientation)
@ -187,7 +187,7 @@ impl Bar {
win.set_layer_shell_margin(gtk_layer_shell::Edge::Left, margin.left); win.set_layer_shell_margin(gtk_layer_shell::Edge::Left, margin.left);
win.set_layer_shell_margin(gtk_layer_shell::Edge::Right, margin.right); win.set_layer_shell_margin(gtk_layer_shell::Edge::Right, margin.right);
let bar_orientation = position.get_orientation(); let bar_orientation = position.orientation();
win.set_anchor( win.set_anchor(
gtk_layer_shell::Edge::Top, gtk_layer_shell::Edge::Top,
@ -351,7 +351,7 @@ fn add_modules(
ironbar: &Rc<Ironbar>, ironbar: &Rc<Ironbar>,
popup: &Rc<RefCell<Popup>>, popup: &Rc<RefCell<Popup>>,
) -> Result<()> { ) -> Result<()> {
let orientation = info.bar_position.get_orientation(); let orientation = info.bar_position.orientation();
macro_rules! add_module { macro_rules! add_module {
($module:expr, $id:expr) => {{ ($module:expr, $id:expr) => {{

View file

@ -38,7 +38,7 @@ impl<'de> Deserialize<'de> for MonitorConfig {
impl BarPosition { impl BarPosition {
/// Gets the orientation the bar and widgets should use /// Gets the orientation the bar and widgets should use
/// based on this position. /// based on this position.
pub fn get_orientation(self) -> Orientation { pub fn orientation(self) -> Orientation {
if self == Self::Top || self == Self::Bottom { if self == Self::Top || self == Self::Bottom {
Orientation::Horizontal Orientation::Horizontal
} else { } else {

View file

@ -194,7 +194,7 @@ impl Module<gtk::Box> for CustomModule {
context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>, context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
info: &ModuleInfo, info: &ModuleInfo,
) -> Result<ModuleParts<gtk::Box>> { ) -> Result<ModuleParts<gtk::Box>> {
let orientation = info.bar_position.get_orientation(); let orientation = info.bar_position.orientation();
let container = gtk::Box::builder().orientation(orientation).build(); let container = gtk::Box::builder().orientation(orientation).build();
let popup_buttons = Rc::new(RefCell::new(Vec::new())); let popup_buttons = Rc::new(RefCell::new(Vec::new()));
@ -236,7 +236,7 @@ impl Module<gtk::Box> for CustomModule {
if let Some(popup) = self.popup { if let Some(popup) = self.popup {
let custom_context = CustomWidgetContext { let custom_context = CustomWidgetContext {
tx: &tx, tx: &tx,
bar_orientation: info.bar_position.get_orientation(), bar_orientation: info.bar_position.orientation(),
icon_theme: info.icon_theme, icon_theme: info.icon_theme,
popup_buttons: Rc::new(RefCell::new(vec![])), popup_buttons: Rc::new(RefCell::new(vec![])),
}; };

View file

@ -113,7 +113,7 @@ impl Module<gtk::Box> for FocusedModule {
) -> Result<ModuleParts<gtk::Box>> { ) -> Result<ModuleParts<gtk::Box>> {
let icon_theme = info.icon_theme; let icon_theme = info.icon_theme;
let container = gtk::Box::new(info.bar_position.get_orientation(), 5); let container = gtk::Box::new(info.bar_position.orientation(), 5);
let icon = gtk::Image::new(); let icon = gtk::Image::new();
if self.show_icon { if self.show_icon {

View file

@ -225,9 +225,7 @@ impl ItemButton {
try_send!( try_send!(
tx, tx,
ModuleUpdateEvent::OpenPopupAt( ModuleUpdateEvent::OpenPopupAt(button.geometry(bar_position.orientation()))
button.geometry(bar_position.get_orientation())
)
); );
} else { } else {
try_send!(tx, ModuleUpdateEvent::ClosePopup); try_send!(tx, ModuleUpdateEvent::ClosePopup);

View file

@ -301,7 +301,7 @@ impl Module<gtk::Box> for LauncherModule {
) -> crate::Result<ModuleParts<gtk::Box>> { ) -> crate::Result<ModuleParts<gtk::Box>> {
let icon_theme = info.icon_theme; let icon_theme = info.icon_theme;
let container = gtk::Box::new(info.bar_position.get_orientation(), 0); let container = gtk::Box::new(info.bar_position.orientation(), 0);
{ {
let container = container.clone(); let container = container.clone();

View file

@ -188,7 +188,7 @@ impl Module<gtk::Box> for SysInfoModule {
) -> Result<ModuleParts<gtk::Box>> { ) -> Result<ModuleParts<gtk::Box>> {
let re = Regex::new(r"\{([^}]+)}")?; let re = Regex::new(r"\{([^}]+)}")?;
let container = gtk::Box::new(info.bar_position.get_orientation(), 10); let container = gtk::Box::new(info.bar_position.orientation(), 10);
let mut labels = Vec::new(); let mut labels = Vec::new();

View file

@ -89,7 +89,7 @@ impl Module<MenuBar> for TrayModule {
let container = MenuBar::new(); let container = MenuBar::new();
let direction = self.direction.unwrap_or( let direction = self.direction.unwrap_or(
if info.bar_position.get_orientation() == gtk::Orientation::Vertical { if info.bar_position.orientation() == gtk::Orientation::Vertical {
PackDirection::Ttb PackDirection::Ttb
} else { } else {
PackDirection::Ltr PackDirection::Ltr

View file

@ -189,7 +189,7 @@ impl Module<gtk::Box> for WorkspacesModule {
context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>, context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
info: &ModuleInfo, info: &ModuleInfo,
) -> Result<ModuleParts<gtk::Box>> { ) -> Result<ModuleParts<gtk::Box>> {
let container = gtk::Box::new(info.bar_position.get_orientation(), 0); let container = gtk::Box::new(info.bar_position.orientation(), 0);
let name_map = self.name_map.clone().unwrap_or_default(); let name_map = self.name_map.clone().unwrap_or_default();
let favs = self.favorites.clone(); let favs = self.favorites.clone();