Merge remote-tracking branch 'upstream/master' into yoda-dock-magnification
# Conflicts: # Cargo.lock # Cargo.toml # cosmic-app-list/src/app.rs # cosmic-applet-audio/src/lib.rs # cosmic-applet-input-sources/Cargo.toml # cosmic-applet-input-sources/src/lib.rs # cosmic-applet-status-area/src/components/app.rs # cosmic-panel-button/src/lib.rs
This commit is contained in:
commit
673547dc52
119 changed files with 2247 additions and 1190 deletions
|
|
@ -0,0 +1 @@
|
|||
cosmic-applet-workspaces = Espais de treball del COSMIC
|
||||
|
|
@ -0,0 +1 @@
|
|||
cosmic-applet-workspaces = Espazos de traballo de COSMIC
|
||||
|
|
@ -203,24 +203,20 @@ impl cosmic::Application for IcedWorkspacesApplet {
|
|||
let content = column!(content, space::horizontal().width(Length::Fixed(width)))
|
||||
.align_x(Alignment::Center);
|
||||
|
||||
let btn = button(
|
||||
container(content)
|
||||
.align_x(Alignment::Center)
|
||||
.align_y(Alignment::Center),
|
||||
)
|
||||
.padding(if horizontal {
|
||||
[0, self.core.applet.suggested_padding(true).1]
|
||||
} else {
|
||||
[self.core.applet.suggested_padding(true).1, 0]
|
||||
})
|
||||
.on_press(
|
||||
if w.state.contains(ext_workspace_handle_v1::State::Active) {
|
||||
Message::WorkspaceOverview
|
||||
let btn = button(content)
|
||||
.padding(if horizontal {
|
||||
[0, self.core.applet.suggested_padding(true).1]
|
||||
} else {
|
||||
Message::WorkspacePressed(w.handle.clone())
|
||||
},
|
||||
)
|
||||
.padding(0);
|
||||
[self.core.applet.suggested_padding(true).1, 0]
|
||||
})
|
||||
.on_press(
|
||||
if w.state.contains(ext_workspace_handle_v1::State::Active) {
|
||||
Message::WorkspaceOverview
|
||||
} else {
|
||||
Message::WorkspacePressed(w.handle.clone())
|
||||
},
|
||||
)
|
||||
.padding(0);
|
||||
|
||||
btn.class(
|
||||
if w.state.contains(ext_workspace_handle_v1::State::Active) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue