Skip to content

Fix formatvalue size and better align items #2040

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
merged 1 commit into from
Apr 26, 2025
Merged

Fix formatvalue size and better align items #2040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 10 additions & 3 deletions openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/FormatvalueWidget.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2025, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand All @@ -34,14 +34,17 @@
</template>

<script>
// When we apply a fixed character width we need to pad a bit since the
// width applies to the enclosing div and not the underlying input
const INPUT_PADDING = 4
import Widget from './Widget'
import ValueWidget from './ValueWidget.vue'

export default {
mixins: [Widget],
components: {
ValueWidget,
},
mixins: [Widget],
computed: {
getParameters() {
return [
Expand All @@ -53,7 +56,11 @@ export default {
},
},
created() {
this.setWidth(this.parameters[5], 'ch', 12)
this.setWidth(
parseInt(this.parameters[5]) + INPUT_PADDING,
'ch',
12 + INPUT_PADDING,
)
},
}
</script>
10 changes: 5 additions & 5 deletions openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/LabelvaluedescWidget.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2022, OpenC3, Inc.
# All changes Copyright 2025, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand Down Expand Up @@ -49,17 +49,17 @@ import ValueWidget from './ValueWidget.vue'
import { OpenC3Api } from '@openc3/js-common/services'

export default {
components: {
LabelWidget,
ValueWidget,
},
mixins: [Widget],
data() {
return {
description: '',
valueParameters: [],
}
},
components: {
LabelWidget,
ValueWidget,
},
computed: {
labelName() {
return [this.description]
Expand Down
8 changes: 4 additions & 4 deletions openc3-cosmos-init/plugins/packages/openc3-vue-common/src/widgets/Widget.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# GNU Affero General Public License for more details.

# Modified by OpenC3, Inc.
# All changes Copyright 2024, OpenC3, Inc.
# All changes Copyright 2025, OpenC3, Inc.
# All Rights Reserved
#
# This file may also be used under the terms of a commercial license
Expand Down Expand Up @@ -87,9 +87,9 @@ export default {
this.appliedStyle['height'] === undefined
) {
// This flex allows for alignment in our widgets
// The value of '0 10 100%' was achieved through trial and error
// The larger flex-shrink value was critical for success
this.appliedStyle['flex'] = '0 10 100%' // flex-grow, flex-shrink, flex-basis
// The value of '1 1 auto' means allow items to grow and shrink proportionally
// and by default try to take an equal portion of the parent
this.appliedStyle['flex'] = '1 1 auto' // flex-grow, flex-shrink, flex-basis
}
return this.appliedStyle
},
Expand Down
Loading