feat(GcodePreview): adds multi-tool support #1753
+324
−132
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,67 @@ | ||||||
| <template> | ||||||
| <div | ||||||
| class="gcode-preview-tool" | ||||||
| :class="{ | ||||||
| active: active | ||||||
| }" | ||||||
| > | ||||||
| <span | ||||||
| class="extruder-color mr-1" | ||||||
| :style="{ | ||||||
| background: color | ||||||
| }" | ||||||
| /> | ||||||
| {{ tool }} | ||||||
| </div> | ||||||
| </template> | ||||||
|
|
||||||
| <script lang="ts"> | ||||||
| import { Component, Prop, Vue } from 'vue-property-decorator' | ||||||
| import type { Tool } from '@/store/gcodePreview/types' | ||||||
|
|
||||||
| @Component({}) | ||||||
| export default class GcodePreviewTool extends Vue { | ||||||
| @Prop({ type: String, required: true }) | ||||||
| readonly tool!: Tool | ||||||
|
|
||||||
| @Prop({ type: String, required: true }) | ||||||
| readonly color!: string | ||||||
|
|
||||||
| @Prop({ type: Boolean }) | ||||||
| readonly active?: boolean | ||||||
| } | ||||||
| </script> | ||||||
|
|
||||||
| <style lang="scss" scoped> | ||||||
| @import 'vuetify/src/styles/styles.sass'; | ||||||
|
|
||||||
| @include theme(gcode-preview-tool) using ($material) { | ||||||
| .extruder-color { | ||||||
| border-color: map-deep-get($material, 'text', 'primary'); | ||||||
| } | ||||||
| } | ||||||
|
|
||||||
| .gcode-preview-tool { | ||||||
| display: inline-flex; | ||||||
| border: 1px solid transparent; | ||||||
| border-radius: 6px; | ||||||
| align-items: center; | ||||||
| padding: 0 4px; | ||||||
|
|
||||||
| &.active { | ||||||
| border-color: map-deep-get($material-dark, 'text', 'primary'); | ||||||
|
|
||||||
| & .extruder-color { | ||||||
| border-color: map-deep-get($material-dark, 'text', 'primary'); | ||||||
|
There was a problem hiding this comment. The
Suggested change
Member
Author
There was a problem hiding this comment. That's for inverted color, so keep as is. |
||||||
| } | ||||||
| } | ||||||
|
Comment on lines
+51
to
+57
There was a problem hiding this comment. The active state always uses $material-dark theme colors regardless of current theme. Should use $material variable (line 38-41 pattern) to respect light/dark theme.
Member
Author
There was a problem hiding this comment. That's for inverted color, so keep as is. |
||||||
|
|
||||||
| & .extruder-color { | ||||||
| width: 15px; | ||||||
| height: 15px; | ||||||
| border-width: 1px; | ||||||
| border-style: solid; | ||||||
| border-radius: 50%; | ||||||
| } | ||||||
| } | ||||||
| </style> | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The active state styling uses hardcoded
$material-darktheme variables instead of the dynamic$materialvariable from the@include themeblock. This means the border color won't adapt to the current theme (light/dark). Usemap-deep-get($material, 'text', 'primary')instead to match the theme-aware styling on line 40.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's for inverted color, so keep as is.