mirror of
https://github.com/LGUG2Z/komorebi.git
synced 2026-07-05 20:51:42 +02:00
feat(bar): add icons to workspace-layer widget
This commits adds the ability to set icons for the `workspace-layer` with the `DisplayFormat` and a setting to specify if it should `show_when_tiling` or not. collab with @alex-ds13
This commit is contained in:
Csaba
+103
-22
@@ -85,6 +85,10 @@ pub struct KomorebiLayoutConfig {
|
|||||||
pub struct KomorebiWorkspaceLayerConfig {
|
pub struct KomorebiWorkspaceLayerConfig {
|
||||||
/// Enable the Komorebi Workspace Layer widget
|
/// Enable the Komorebi Workspace Layer widget
|
||||||
pub enable: bool,
|
pub enable: bool,
|
||||||
|
/// Display format of the current layer
|
||||||
|
pub display: Option<DisplayFormat>,
|
||||||
|
/// Show the widget event if the layer is Tiling
|
||||||
|
pub show_when_tiling: Option<bool>,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
#[derive(Copy, Clone, Debug, Serialize, Deserialize, JsonSchema)]
|
||||||
@@ -312,29 +316,106 @@ impl BarWidget for Komorebi {
|
|||||||
.map(|(_, _, layer)| layer);
|
.map(|(_, _, layer)| layer);
|
||||||
|
|
||||||
if let Some(layer) = layer {
|
if let Some(layer) = layer {
|
||||||
let name = layer.to_string();
|
if (layer_config.show_when_tiling.unwrap_or_default()
|
||||||
config.apply_on_widget(false, ui, |ui| {
|
&& matches!(layer, WorkspaceLayer::Tiling))
|
||||||
if SelectableFrame::new(false)
|
|| matches!(layer, WorkspaceLayer::Floating)
|
||||||
.show(ui, |ui| ui.add(Label::new(name).selectable(false)))
|
{
|
||||||
.clicked()
|
let display_format = layer_config.display.unwrap_or(DisplayFormat::Text);
|
||||||
&& komorebi_client::send_batch([
|
let size = Vec2::splat(config.icon_font_id.size);
|
||||||
SocketMessage::MouseFollowsFocus(false),
|
|
||||||
SocketMessage::ToggleWorkspaceLayer,
|
config.apply_on_widget(false, ui, |ui| {
|
||||||
SocketMessage::MouseFollowsFocus(
|
let layer_frame = SelectableFrame::new(false)
|
||||||
|
.show(ui, |ui| {
|
||||||
|
if display_format != DisplayFormat::Text {
|
||||||
|
if matches!(layer, WorkspaceLayer::Tiling) {
|
||||||
|
let (response, painter) =
|
||||||
|
ui.allocate_painter(size, Sense::hover());
|
||||||
|
let color = ui.style().visuals.text_color();
|
||||||
|
let stroke = Stroke::new(1.0, color);
|
||||||
|
let mut rect = response.rect;
|
||||||
|
let corner =
|
||||||
|
CornerRadius::same((rect.width() * 0.1) as u8);
|
||||||
|
rect = rect.shrink(stroke.width);
|
||||||
|
|
||||||
|
// tiling
|
||||||
|
let mut rect_left = response.rect;
|
||||||
|
rect_left.set_width(rect.width() * 0.48);
|
||||||
|
rect_left.set_height(rect.height() * 0.98);
|
||||||
|
let mut rect_right = rect_left;
|
||||||
|
rect_left = rect_left.translate(Vec2::new(
|
||||||
|
rect.width() * 0.01 + stroke.width,
|
||||||
|
rect.width() * 0.01 + stroke.width,
|
||||||
|
));
|
||||||
|
rect_right = rect_right.translate(Vec2::new(
|
||||||
|
rect.width() * 0.51 + stroke.width,
|
||||||
|
rect.width() * 0.01 + stroke.width,
|
||||||
|
));
|
||||||
|
painter.rect_filled(rect_left, corner, color);
|
||||||
|
painter.rect_stroke(
|
||||||
|
rect_right,
|
||||||
|
corner,
|
||||||
|
stroke,
|
||||||
|
StrokeKind::Outside,
|
||||||
|
);
|
||||||
|
} else {
|
||||||
|
let (response, painter) =
|
||||||
|
ui.allocate_painter(size, Sense::hover());
|
||||||
|
let color = ui.style().visuals.text_color();
|
||||||
|
let stroke = Stroke::new(1.0, color);
|
||||||
|
let mut rect = response.rect;
|
||||||
|
let corner =
|
||||||
|
CornerRadius::same((rect.width() * 0.1) as u8);
|
||||||
|
rect = rect.shrink(stroke.width);
|
||||||
|
|
||||||
|
// floating
|
||||||
|
let mut rect_left = response.rect;
|
||||||
|
rect_left.set_width(rect.width() * 0.65);
|
||||||
|
rect_left.set_height(rect.height() * 0.65);
|
||||||
|
let mut rect_right = rect_left;
|
||||||
|
rect_left = rect_left.translate(Vec2::new(
|
||||||
|
rect.width() * 0.01 + stroke.width,
|
||||||
|
rect.width() * 0.01 + stroke.width,
|
||||||
|
));
|
||||||
|
rect_right = rect_right.translate(Vec2::new(
|
||||||
|
rect.width() * 0.34 + stroke.width,
|
||||||
|
rect.width() * 0.34 + stroke.width,
|
||||||
|
));
|
||||||
|
painter.rect_filled(rect_left, corner, color);
|
||||||
|
painter.rect_stroke(
|
||||||
|
rect_right,
|
||||||
|
corner,
|
||||||
|
stroke,
|
||||||
|
StrokeKind::Outside,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if display_format != DisplayFormat::Icon {
|
||||||
|
ui.add(Label::new(layer.to_string()).selectable(false));
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.on_hover_text(layer.to_string());
|
||||||
|
|
||||||
|
if layer_frame.clicked()
|
||||||
|
&& komorebi_client::send_batch([
|
||||||
|
SocketMessage::MouseFollowsFocus(false),
|
||||||
|
SocketMessage::ToggleWorkspaceLayer,
|
||||||
|
SocketMessage::MouseFollowsFocus(
|
||||||
|
komorebi_notification_state.mouse_follows_focus,
|
||||||
|
),
|
||||||
|
])
|
||||||
|
.is_err()
|
||||||
|
{
|
||||||
|
tracing::error!(
|
||||||
|
"could not send the following batch of messages to komorebi:\n\
|
||||||
|
MouseFollowsFocus(false),
|
||||||
|
ToggleWorkspaceLayer,
|
||||||
|
MouseFollowsFocus({})",
|
||||||
komorebi_notification_state.mouse_follows_focus,
|
komorebi_notification_state.mouse_follows_focus,
|
||||||
),
|
);
|
||||||
])
|
}
|
||||||
.is_err()
|
});
|
||||||
{
|
}
|
||||||
tracing::error!(
|
|
||||||
"could not send the following batch of messages to komorebi:\n\
|
|
||||||
MouseFollowsFocus(false),
|
|
||||||
ToggleWorkspaceLayer,
|
|
||||||
MouseFollowsFocus({})",
|
|
||||||
komorebi_notification_state.mouse_follows_focus,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+132
@@ -511,9 +511,53 @@
|
|||||||
"enable"
|
"enable"
|
||||||
],
|
],
|
||||||
"properties": {
|
"properties": {
|
||||||
|
"display": {
|
||||||
|
"description": "Display format of the current layer",
|
||||||
|
"oneOf": [
|
||||||
|
{
|
||||||
|
"description": "Show only icon",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"Icon"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show only text",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"Text"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show an icon and text for the selected element, and text on the rest",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"TextAndIconOnSelected"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show both icon and text",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"IconAndText"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show an icon and text for the selected element, and icons on the rest",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"IconAndTextOnSelected"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
"enable": {
|
"enable": {
|
||||||
"description": "Enable the Komorebi Workspace Layer widget",
|
"description": "Enable the Komorebi Workspace Layer widget",
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"show_when_tiling": {
|
||||||
|
"description": "Show the widget event if the layer is Tiling",
|
||||||
|
"type": "boolean"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -1865,9 +1909,53 @@
|
|||||||
"enable"
|
"enable"
|
||||||
],
|
],
|
||||||
"properties": {
|
"properties": {
|
||||||
|
"display": {
|
||||||
|
"description": "Display format of the current layer",
|
||||||
|
"oneOf": [
|
||||||
|
{
|
||||||
|
"description": "Show only icon",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"Icon"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show only text",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"Text"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show an icon and text for the selected element, and text on the rest",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"TextAndIconOnSelected"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show both icon and text",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"IconAndText"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show an icon and text for the selected element, and icons on the rest",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"IconAndTextOnSelected"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
"enable": {
|
"enable": {
|
||||||
"description": "Enable the Komorebi Workspace Layer widget",
|
"description": "Enable the Komorebi Workspace Layer widget",
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"show_when_tiling": {
|
||||||
|
"description": "Show the widget event if the layer is Tiling",
|
||||||
|
"type": "boolean"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@@ -3152,9 +3240,53 @@
|
|||||||
"enable"
|
"enable"
|
||||||
],
|
],
|
||||||
"properties": {
|
"properties": {
|
||||||
|
"display": {
|
||||||
|
"description": "Display format of the current layer",
|
||||||
|
"oneOf": [
|
||||||
|
{
|
||||||
|
"description": "Show only icon",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"Icon"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show only text",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"Text"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show an icon and text for the selected element, and text on the rest",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"TextAndIconOnSelected"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show both icon and text",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"IconAndText"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"description": "Show an icon and text for the selected element, and icons on the rest",
|
||||||
|
"type": "string",
|
||||||
|
"enum": [
|
||||||
|
"IconAndTextOnSelected"
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
"enable": {
|
"enable": {
|
||||||
"description": "Enable the Komorebi Workspace Layer widget",
|
"description": "Enable the Komorebi Workspace Layer widget",
|
||||||
"type": "boolean"
|
"type": "boolean"
|
||||||
|
},
|
||||||
|
"show_when_tiling": {
|
||||||
|
"description": "Show the widget event if the layer is Tiling",
|
||||||
|
"type": "boolean"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in New Issue
Block a user