Skip to content

Commit 5515002

Browse files
committed
ui: use filled buttons in desktop editor and notifications
1 parent 131b0d3 commit 5515002

4 files changed

Lines changed: 13 additions & 13 deletions

File tree

src/shell/control_center/tabs/notifications_tab.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ namespace {
8383
ui::button({
8484
.text = historyActionLabel(actionKey, actions[i + 1]),
8585
.fontSize = Style::fontSizeCaption * scale,
86-
.variant = ButtonVariant::Outline,
86+
.variant = ButtonVariant::Default,
8787
})
8888
);
8989
}
@@ -452,7 +452,7 @@ namespace {
452452
auto button = ui::button({
453453
.text = historyActionLabel(actionKey, entry.notification.actions[i + 1]),
454454
.fontSize = Style::fontSizeCaption * m_scale,
455-
.variant = ButtonVariant::Outline,
455+
.variant = ButtonVariant::Default,
456456
});
457457
button->setOnClick([onAction, id = entry.notification.id, key = std::string(actionKey)]() {
458458
onAction(id, key);

src/shell/desktop/editor/desktop_widgets_editor.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1138,45 +1138,45 @@ void DesktopWidgetsEditor::rebuildScene(OverlaySurface& surface) {
11381138
ui::button({
11391139
.glyph = "copy-plus",
11401140
.enabled = canCloneSelected,
1141-
.variant = ButtonVariant::Outline,
1141+
.variant = ButtonVariant::Default,
11421142
.tooltip = i18n::tr("desktop-widgets.editor.actions.clone"),
11431143
.onClick = [this]() { deferEditorMutation([this]() { cloneSelectedWidgets(); }); },
11441144
}),
11451145
ui::button({
11461146
.glyph = "stack-back",
11471147
.enabled = canSendSelectedToBack,
1148-
.variant = ButtonVariant::Outline,
1148+
.variant = ButtonVariant::Default,
11491149
.tooltip = i18n::tr("desktop-widgets.editor.actions.stack-back"),
11501150
.onClick = [this]() { deferEditorMutation([this]() { sendSelectedWidgetToBack(); }); },
11511151
}),
11521152
ui::button({
11531153
.glyph = "stack-front",
11541154
.enabled = canBringSelectedToFront,
1155-
.variant = ButtonVariant::Outline,
1155+
.variant = ButtonVariant::Default,
11561156
.tooltip = i18n::tr("desktop-widgets.editor.actions.stack-front"),
11571157
.onClick = [this]() { deferEditorMutation([this]() { bringSelectedWidgetToFront(); }); },
11581158
}),
11591159
ui::button({
11601160
.glyph = "flip-vertical",
11611161
.enabled = hasSelectedWidget && !selectedIsLoginBox,
11621162
.selected = selectedFlipX,
1163-
.variant = ButtonVariant::Outline,
1163+
.variant = ButtonVariant::Default,
11641164
.tooltip = i18n::tr("desktop-widgets.editor.actions.flip-horizontal"),
11651165
.onClick = [this]() { deferEditorMutation([this]() { flipSelectedWidgetHorizontal(); }); },
11661166
}),
11671167
ui::button({
11681168
.glyph = "flip-horizontal",
11691169
.enabled = hasSelectedWidget && !selectedIsLoginBox,
11701170
.selected = selectedFlipY,
1171-
.variant = ButtonVariant::Outline,
1171+
.variant = ButtonVariant::Default,
11721172
.tooltip = i18n::tr("desktop-widgets.editor.actions.flip-vertical"),
11731173
.onClick = [this]() { deferEditorMutation([this]() { flipSelectedWidgetVertical(); }); },
11741174
}),
11751175
ui::button({
11761176
.glyph = "settings",
11771177
.enabled = hasSelectedWidget,
11781178
.selected = m_inspectorOpen,
1179-
.variant = ButtonVariant::Outline,
1179+
.variant = ButtonVariant::Default,
11801180
.tooltip = i18n::tr("desktop-widgets.editor.actions.settings"),
11811181
.onClick =
11821182
[this]() {
@@ -1205,7 +1205,7 @@ void DesktopWidgetsEditor::rebuildScene(OverlaySurface& surface) {
12051205
.glyph = selectedWidgetEnabled ? "eye" : "eye-off",
12061206
.enabled = canToggleVisibility,
12071207
.selected = selectedWidgetEnabled,
1208-
.variant = ButtonVariant::Outline,
1208+
.variant = ButtonVariant::Default,
12091209
.tooltip = selectedWidgetEnabled ? i18n::tr("desktop-widgets.editor.actions.hide")
12101210
: i18n::tr("desktop-widgets.editor.actions.show"),
12111211
.onClick = [this]() { deferEditorMutation([this]() { toggleSelectedWidgetEnabled(); }); },
@@ -1233,7 +1233,7 @@ void DesktopWidgetsEditor::rebuildScene(OverlaySurface& surface) {
12331233
: i18n::tr("desktop-widgets.editor.state.grid-off"),
12341234
.controlHeight = Style::controlHeightSm,
12351235
.selected = m_snapshot.grid.visible,
1236-
.variant = ButtonVariant::Outline,
1236+
.variant = ButtonVariant::Default,
12371237
.onClick =
12381238
[this]() {
12391239
deferEditorMutation([this]() {

src/shell/desktop/editor/desktop_widgets_editor_settings.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ namespace {
354354
auto picker = ui::button({
355355
.glyph = "apps",
356356
.glyphSize = Style::fontSizeBody,
357-
.variant = ButtonVariant::Outline,
357+
.variant = ButtonVariant::Default,
358358
.minWidth = Style::controlHeightSm,
359359
.minHeight = Style::controlHeightSm,
360360
.paddingV = Style::spaceXs,
@@ -405,7 +405,7 @@ namespace {
405405
labelText,
406406
ui::button({
407407
.text = i18n::tr("desktop-widgets.editor.settings.change-image"),
408-
.variant = ButtonVariant::Outline,
408+
.variant = ButtonVariant::Default,
409409
.flexGrow = 1.0f,
410410
.onClick = [editor, key]() {
411411
FileDialogOptions options;

src/shell/notification/notification_toast.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -281,7 +281,7 @@ namespace {
281281
return ui::button({
282282
.text = std::string(label),
283283
.fontSize = Style::fontSizeCaption * scale,
284-
.variant = ButtonVariant::Outline,
284+
.variant = ButtonVariant::Default,
285285
});
286286
}
287287

0 commit comments

Comments
 (0)