starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-04-25 10:08:33 +02:00
Code Issues 87 Packages Projects Releases 10 Wiki Activity

fix(bar): use layout on Area to prevent shaking

Browse Source 
There were some cases were the bar was showing some shaking, turns out
that using `ui.with_layout` instead of `ui.horizontal_centered` removes
this shaking, so this commit makes that change and uses the
`right_to_left` layout on the right widgets again, meaning that we need
to reverse them again.
This commit is contained in:
alex-ds13
2024-12-19 16:17:01 +00:00
committed by جاد
parent eb8a988841
commit ad08585faf
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
komorebi-bar/src/bar.rs
View File

@@ -17,6 +17,7 @@ use crate::MONITOR_LEFT;
use crate::MONITOR_RIGHT; use crate::MONITOR_RIGHT;
use crate::MONITOR_TOP; use crate::MONITOR_TOP;
use crossbeam_channel::Receiver; use crossbeam_channel::Receiver;
use eframe::egui::Align;
use eframe::egui::Align2; use eframe::egui::Align2;
use eframe::egui::Area; use eframe::egui::Area;
use eframe::egui::CentralPanel; use eframe::egui::CentralPanel;
@@ -28,6 +29,7 @@ use eframe::egui::FontFamily;
use eframe::egui::FontId; use eframe::egui::FontId;
use eframe::egui::Frame; use eframe::egui::Frame;
use eframe::egui::Id; use eframe::egui::Id;
use eframe::egui::Layout;
use eframe::egui::Margin; use eframe::egui::Margin;
use eframe::egui::Rgba; use eframe::egui::Rgba;
use eframe::egui::Style; use eframe::egui::Style;
@@ -397,6 +399,8 @@ impl Komobar {
}); });
} }
right_widgets.reverse();
self.left_widgets = left_widgets; self.left_widgets = left_widgets;
self.center_widgets = center_widgets; self.center_widgets = center_widgets;
self.right_widgets = right_widgets; self.right_widgets = right_widgets;
@@ -582,7 +586,7 @@ impl eframe::App for Komobar {
left_area_frame.inner_margin.left = frame.inner_margin.x; left_area_frame.inner_margin.left = frame.inner_margin.x;
} }
left_area_frame.show(ui, |ui| { left_area_frame.show(ui, |ui| {
ui.horizontal_centered(|ui| { ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
let mut render_conf = render_config.clone(); let mut render_conf = render_config.clone();
render_conf.alignment = Some(Alignment::Left); render_conf.alignment = Some(Alignment::Left);
@@ -606,7 +610,7 @@ impl eframe::App for Komobar {
right_area_frame.inner_margin.right = frame.inner_margin.x; right_area_frame.inner_margin.right = frame.inner_margin.x;
} }
right_area_frame.show(ui, |ui| { right_area_frame.show(ui, |ui| {
ui.horizontal_centered(|ui| { ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
let mut render_conf = render_config.clone(); let mut render_conf = render_config.clone();
render_conf.alignment = Some(Alignment::Right); render_conf.alignment = Some(Alignment::Right);
@@ -627,7 +631,7 @@ impl eframe::App for Komobar {
.show(ctx, |ui| { .show(ctx, |ui| {
let center_area_frame = area_frame; let center_area_frame = area_frame;
center_area_frame.show(ui, |ui| { center_area_frame.show(ui, |ui| {
ui.horizontal_centered(|ui| { ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
let mut render_conf = render_config.clone(); let mut render_conf = render_config.clone();
render_conf.alignment = Some(Alignment::Center); render_conf.alignment = Some(Alignment::Center);