starred/komorebi
1
0
Fork 0
mirror of https://github.com/LGUG2Z/komorebi.git synced 2026-07-14 17:12:58 +02:00
Code Issues 87 Packages Projects Releases 11 Wiki Activity

account for ui item_spacing when setting the widget_spacing

Browse Source
This commit is contained in:
Csaba
2024-11-16 18:28:09 +01:00
parent 97e36173f4
commit 9ec67ad988
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
komorebi-bar/src/render.rs
+10 -9
View File
@@ -105,7 +105,7 @@ impl RenderConfig {
add_contents: impl FnOnce(&mut Ui) -> R, add_contents: impl FnOnce(&mut Ui) -> R,
) -> InnerResponse<R> { ) -> InnerResponse<R> {
self.more_inner_margin = more_inner_margin; self.more_inner_margin = more_inner_margin;
let outer_margin = self.widget_outer_margin(); let outer_margin = self.widget_outer_margin(ui);
if let Grouping::Widget(config) = self.grouping { if let Grouping::Widget(config) = self.grouping {
return self.define_group(Some(outer_margin), config, ui, add_contents); return self.define_group(Some(outer_margin), config, ui, add_contents);
@@ -143,7 +143,7 @@ impl RenderConfig {
ui: &mut Ui, ui: &mut Ui,
add_contents: impl FnOnce(&mut Ui) -> R, add_contents: impl FnOnce(&mut Ui) -> R,
) -> InnerResponse<R> { ) -> InnerResponse<R> {
Frame::none() Frame::group(ui.style_mut())
.outer_margin(outer_margin.unwrap_or(Margin::ZERO)) .outer_margin(outer_margin.unwrap_or(Margin::ZERO))
.inner_margin(match self.more_inner_margin { .inner_margin(match self.more_inner_margin {
true => Margin::symmetric(8.0, 3.0), true => Margin::symmetric(8.0, 3.0),
@@ -174,19 +174,16 @@ impl RenderConfig {
.show(ui, add_contents) .show(ui, add_contents)
} }
fn set_spacing(&mut self) { fn widget_outer_margin(&mut self, ui: &mut Ui) -> Margin {
self.applied_on_widget = true;
}
fn widget_outer_margin(&mut self) -> Margin {
let spacing = if self.applied_on_widget { let spacing = if self.applied_on_widget {
self.spacing // Remove the default item spacing from the margin
self.spacing - ui.spacing().item_spacing.x
} else { } else {
0.0 0.0
}; };
if !self.applied_on_widget { if !self.applied_on_widget {
self.set_spacing(); self.applied_on_widget = true;
} }
Margin { Margin {
@@ -212,14 +209,18 @@ impl RenderConfig {
#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)] #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
pub struct GroupingConfig { pub struct GroupingConfig {
/// Styles for the grouping
pub style: Option<GroupingStyle>, pub style: Option<GroupingStyle>,
/// Alpha value for the color transparency [[0-255]] (default: 200)
pub transparency_alpha: Option<u8>, pub transparency_alpha: Option<u8>,
/// Rounding values for the 4 corners. Can be a single or 4 values.
pub rounding: Option<RoundingConfig>, pub rounding: Option<RoundingConfig>,
} }
#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)] #[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
pub enum GroupingStyle { pub enum GroupingStyle {
Default, Default,
/// A black shadow is added under the default group
DefaultWithShadow, DefaultWithShadow,
} }