JakeStanger/ironbar
1
1
Fork 0
mirror of https://github.com/JakeStanger/ironbar.git synced 2024-11-30 14:03:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #189 from JakeStanger/fix/icon-classes

Browse Source 
fix: add sensible class names for icon labels
This commit is contained in:
Jake Stanger 2023-06-14 20:34:13 +01:00 committed by GitHub
commit 6f7af07cdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 286 additions and 344 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

547
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

2
Cargo.toml
View File

@ -98,7 +98,7 @@ zbus = { version = "3.13.1", optional = true }
# workspaces # workspaces
swayipc-async = { version = "2.0.1", optional = true } swayipc-async = { version = "2.0.1", optional = true }
hyprland = { version = "0.3.1", optional = true } hyprland = { version = "=0.3.1", optional = true }
futures-util = { version = "0.3.21", optional = true } futures-util = { version = "0.3.21", optional = true }
# shared # shared

3
docs/modules/Clipboard.md
View File

@ -86,6 +86,9 @@ end:
|--------------------------------------|------------------------------------------------------| |--------------------------------------|------------------------------------------------------|
| `.clipboard` | Clipboard widget. | | `.clipboard` | Clipboard widget. |
| `.clipboard .btn` | Clipboard widget button. | | `.clipboard .btn` | Clipboard widget button. |
| `.clipboard .btn .icon` | Clipboard widget button icon (any type). |
| `.clipboard .btn .text-icon` | Clipboard widget button icon (textual only). |
| `.clipboard .btn .image` | Clipboard widget button icon (image only). |
| `.popup-clipboard` | Clipboard popup box. | | `.popup-clipboard` | Clipboard popup box. |
| `.popup-clipboard .item` | Clipboard row item inside the popup. | | `.popup-clipboard .item` | Clipboard row item inside the popup. |
| `.popup-clipboard .item .btn` | Clipboard row item radio button. | | `.popup-clipboard .item .btn` | Clipboard row item radio button. |

20
docs/modules/Music.md
View File

@ -134,19 +134,31 @@ and will be replaced with values from the currently playing track:
## Styling ## Styling
| Selector | Description | | Selector | Description |
|-------------------------------------|------------------------------------------| |---------------------------------------------|-------------------------------------------------------|
| `.music` | Tray widget button | | `.music` | Tray widget button |
| `.music .contents` | Tray widget button contents box | | `.music .contents` | Tray widget button contents box |
| `.music .contents .icon` | Tray widget button icon (any type) |
| `.music .contents .text-icon` | Tray widget button icon (textual only) |
| `.music .contents .image` | Tray widget button icon (image only) |
| `.popup-music` | Popup box | | `.popup-music` | Popup box |
| `.popup-music .album-art` | Album art image inside popup box | | `.popup-music .album-art` | Album art image inside popup box |
| `.popup-music .title` | Track title container inside popup box | | `.popup-music .title` | Track title container inside popup box |
| `.popup-music .title .icon` | Track title icon label inside popup box | | `.popup-music .title .icon-box` | Track title icon container inside popup box |
| `.popup-music .title .icon-box .icon` | Track title icon inside its container (any type) |
| `.popup-music .title .icon-box .text-icon` | Track title icon inside its container (textual only) |
| `.popup-music .title .icon-box .image` | Track title icon inside its container (image only) |
| `.popup-music .title .label` | Track title label inside popup box | | `.popup-music .title .label` | Track title label inside popup box |
| `.popup-music .album` | Track album container inside popup box | | `.popup-music .album` | Track album container inside popup box |
| `.popup-music .album .icon` | Track album icon label inside popup box | | `.popup-music .album .icon-box` | Track album icon container inside popup box |
| `.popup-music .album .icon-box .icon` | Track album icon inside its container (any type) |
| `.popup-music .album .icon-box .text-icon` | Track album icon inside its container (textual only) |
| `.popup-music .album .icon-box .image` | Track album icon inside its container (image only) |
| `.popup-music .album .label` | Track album label inside popup box | | `.popup-music .album .label` | Track album label inside popup box |
| `.popup-music .artist` | Track artist container inside popup box | | `.popup-music .artist` | Track artist container inside popup box |
| `.popup-music .artist .icon` | Track artist icon label inside popup box | | `.popup-music .artist .icon-box` | Track artist icon container inside popup box |
| `.popup-music .artist .icon-box .icon` | Track artist icon inside its container (any type) |
| `.popup-music .artist .icon-box .text-icon` | Track artist icon inside its container (textual only) |
| `.popup-music .artist .icon-box .image` | Track artist icon inside its container (image only) |
| `.popup-music .artist .label` | Track artist label inside popup box | | `.popup-music .artist .label` | Track artist label inside popup box |
| `.popup-music .controls` | Controls container inside popup box | | `.popup-music .controls` | Controls container inside popup box |
| `.popup-music .controls .btn-prev` | Previous button inside popup box | | `.popup-music .controls .btn-prev` | Previous button inside popup box |

5
docs/modules/Workspaces.md
View File

@ -90,9 +90,12 @@ end:
## Styling ## Styling
| Selector | Description | | Selector | Description |
|-----------------------------|--------------------------------------| |--------------------------------|--------------------------------------|
| `.workspaces` | Workspaces widget box | | `.workspaces` | Workspaces widget box |
| `.workspaces .item` | Workspace button | | `.workspaces .item` | Workspace button |
| `.workspaces .item.focused` | Workspace button (workspace focused) | | `.workspaces .item.focused` | Workspace button (workspace focused) |
| `.workspaces .item .icon` | Workspace button icon (any type) |
| `.workspaces .item .text-icon` | Workspace button icon (textual only) |
| `.workspaces .item .image` | Workspace button icon (image only) |
For more information on styling, please see the [styling guide](styling-guide). For more information on styling, please see the [styling guide](styling-guide).

5
src/image/gtk.rs
View File

@ -10,6 +10,7 @@ pub fn new_icon_button(input: &str, icon_theme: &IconTheme, size: i32) -> Button
if ImageProvider::is_definitely_image_input(input) { if ImageProvider::is_definitely_image_input(input) {
let image = Image::new(); let image = Image::new();
add_class(&image, "image"); add_class(&image, "image");
add_class(&image, "icon");
match ImageProvider::parse(input, icon_theme, size) match ImageProvider::parse(input, icon_theme, size)
.map(|provider| provider.load_into_image(image.clone())) .map(|provider| provider.load_into_image(image.clone()))
@ -35,6 +36,7 @@ pub fn new_icon_label(input: &str, icon_theme: &IconTheme, size: i32) -> gtk::Bo
if ImageProvider::is_definitely_image_input(input) { if ImageProvider::is_definitely_image_input(input) {
let image = Image::new(); let image = Image::new();
add_class(&image, "icon");
add_class(&image, "image"); add_class(&image, "image");
container.add(&image); container.add(&image);
@ -43,7 +45,8 @@ pub fn new_icon_label(input: &str, icon_theme: &IconTheme, size: i32) -> gtk::Bo
.map(|provider| provider.load_into_image(image)); .map(|provider| provider.load_into_image(image));
} else { } else {
let label = Label::new(Some(input)); let label = Label::new(Some(input));
add_class(&label, "label"); add_class(&label, "icon");
add_class(&label, "text-icon");
container.add(&label); container.add(&label);
} }

2
src/modules/music/mod.rs
View File

@ -454,7 +454,7 @@ impl IconLabel {
let icon = new_icon_label(icon_input, icon_theme, 24); let icon = new_icon_label(icon_input, icon_theme, 24);
let label = Label::new(label); let label = Label::new(label);
add_class(&icon, "icon"); add_class(&icon, "icon-box");
add_class(&label, "label"); add_class(&label, "label");
container.add(&icon); container.add(&icon);