Skip to content

fix: circle control contrast #1835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pedrolamas merged 2 commits into from
May 11, 2026
Merged

fix: circle control contrast #1835

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
285a0b0
fix: console text selection (#1834)
pedrolamas May 10, 2026
dde0db1
refactor: simplify styles usage
pedrolamas May 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 57 additions & 21 deletions src/components/widgets/toolhead/ToolheadControlCircle.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
class="app-circle-control"
:class="{
[$vuetify.theme.dark ? 'theme--dark': 'theme--light']: true,
'theme--text--contrast': !isPrimaryColorDark
}"
Comment thread
pedrolamas marked this conversation as resolved.
>
<g class="cc-section">
Expand Down Expand Up @@ -543,6 +544,10 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
return this.$typedGetters['printer/getHasSteppersEnabled']
}

get isPrimaryColorDark (): boolean {
return this.$filters.isColorDark(this.$typedState.config.uiSettings.theme.color)
}

get klippyApp (): KlippyApp {
return this.$typedGetters['printer/getKlippyApp']
}
Expand Down Expand Up @@ -784,48 +789,59 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
@import 'vuetify/src/styles/styles.sass';

@include theme(app-circle-control) using ($material) {
$material-text-primary: map-deep-get($material, 'text', 'primary');
$material-buttons-disabled: map-deep-get($material, 'buttons', 'disabled');

.disabled {
fill: map-deep-get($material, 'buttons', 'disabled') !important;
stroke: map-deep-get($material, 'buttons', 'disabled') !important;
fill: $material-buttons-disabled !important;
stroke: $material-buttons-disabled !important;
}

.cc-btn,
.cc-lbl {
fill: map-deep-get($material, 'text', 'primary');
stroke: map-deep-get($material, 'text', 'primary');
fill: $material-text-primary;
stroke: $material-text-primary;
}
}

@mixin cc-btn-theme ($component, $text, $back, $hover) {
@mixin cc-btn-theme ($component, $text: null, $back: null, $hover: null) {
&#{$component} {
fill: #{$text};
stroke: #{$text};
@if $text {
fill: $text;
stroke: $text;
}

.cc-btn-container {
fill: #{$back};
@if $back {
.cc-btn-container {
fill: #{$back};
}
}

&:hover .cc-btn-container {
fill: #{$hover};
@if $hover {
&:hover .cc-btn-container {
fill: #{$hover};
}
}
}
}

.theme--light.app-circle-control .cc-btn {
@include cc-btn-theme('.inner', '', 'var(--v-btncolor-lighten1)', '');
@include cc-btn-theme('.inner-mid', '', 'var(--v-btncolor-base)', '');
@include cc-btn-theme('.outer-mid', '', 'var(--v-btncolor-darken1)', '');
@include cc-btn-theme('.outer', '', 'var(--v-btncolor-darken2)', '');
@include cc-btn-theme('.inner', $back: 'var(--v-btncolor-lighten1)');
@include cc-btn-theme('.inner-mid', $back: 'var(--v-btncolor-base)');
@include cc-btn-theme('.outer-mid', $back: 'var(--v-btncolor-darken1)');
@include cc-btn-theme('.outer', $back: 'var(--v-btncolor-darken2)');
}

.theme--dark.app-circle-control .cc-btn {
@include cc-btn-theme('.inner', '', 'var(--v-btncolor-lighten2)', '');
@include cc-btn-theme('.inner-mid', '', 'var(--v-btncolor-lighten1)', '');
@include cc-btn-theme('.outer-mid', '', 'var(--v-btncolor-base)', '');
@include cc-btn-theme('.outer', '', 'var(--v-btncolor-darken1)', '');
@include cc-btn-theme('.inner', $back: 'var(--v-btncolor-lighten2)');
@include cc-btn-theme('.inner-mid', $back: 'var(--v-btncolor-lighten1)');
@include cc-btn-theme('.outer-mid', $back: 'var(--v-btncolor-base)');
@include cc-btn-theme('.outer', $back: 'var(--v-btncolor-darken1)');
}

.app-circle-control {
$material-dark-text-primary: map-deep-get($material-dark, 'text', 'primary');

font-size: 16px;
max-height: 350px;
min-height: 275px;
Expand All @@ -849,8 +865,6 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
}

&:not(.disabled) {
$material-dark-text-primary: map-deep-get($material-dark, 'text', 'primary');

@include cc-btn-theme(
'.primary',
$material-dark-text-primary,
Expand Down Expand Up @@ -890,6 +904,10 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
.cc-lbl {
pointer-events: none;
stroke-width: 0;

&:not(.disabled) {
fill: $material-dark-text-primary;
}
}

.large {
Expand All @@ -900,4 +918,22 @@ export default class ToolheadControlCircle extends Mixins(StateMixin, ToolheadMi
pointer-events: none;
}
}

.theme--text--contrast.app-circle-control {
$material-light-text-primary: map-deep-get($material-light, 'text', 'primary');

.cc-btn {
&:not(.disabled) {
@each $cls in '.primary', '.inner', '.inner-mid', '.outer-mid', '.outer' {
@include cc-btn-theme($cls, $material-light-text-primary);
}
}
}

.cc-lbl {
&:not(.disabled) {
fill: $material-light-text-primary;
}
}
}
</style>