Skip to content
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

Jump to bottom

SpinBox fixed for values above the max value #16033

Merged
merged 6 commits into from
Jul 7, 2023
Merged

SpinBox fixed for values above the max value #16033

merged 6 commits into from
Jul 7, 2023

Conversation

saumyaj3
Copy link
Contributor

@saumyaj3 saumyaj3 commented Jul 6, 2023

saumyaj3 and others added 2 commits July 6, 2023 16:07
@saumyaj3
SpinBox fixed for values above the max value
fe5893f 
Spinbox now doesn't take values above the designated maximum
Fixes CURA-10096
@saumyaj3 @github-actions
update translations
082cdb0
@jellespijker
Copy link
Member

@saumyaj3 yes your first bug fix. Don't worry about those merge conflict I will resolve these. They happened due to an automatic workflow

@jellespijker jellespijker self-requested a review July 6, 2023 14:38
@jellespijker
Merge remote-tracking branch 'origin/main' into CURA-10096_Multiply_M…
4185fbb 
…odels_allows_entering_values_over_99_but_won't_multiply_higher_than_99

# Conflicts:
#	resources/i18n/cs_CZ/cura.po
#	resources/i18n/cura.pot
#	resources/i18n/de_DE/cura.po
#	resources/i18n/es_ES/cura.po
#	resources/i18n/fi_FI/cura.po
#	resources/i18n/fr_FR/cura.po
#	resources/i18n/hu_HU/cura.po
#	resources/i18n/it_IT/cura.po
#	resources/i18n/ja_JP/cura.po
#	resources/i18n/ko_KR/cura.po
#	resources/i18n/nl_NL/cura.po
#	resources/i18n/pl_PL/cura.po
#	resources/i18n/pt_BR/cura.po
#	resources/i18n/pt_PT/cura.po
#	resources/i18n/ru_RU/cura.po
#	resources/i18n/tr_TR/cura.po
#	resources/i18n/zh_CN/cura.po
#	resources/i18n/zh_TW/cura.po
jellespijker
jellespijker requested changes Jul 6, 2023
View reviewed changes
resources/qml/SpinBox.qml Outdated Show resolved Hide resolved
resources/qml/SpinBox.qml Outdated Show resolved Hide resolved
@saumyaj3
SpinBox fixed for values above the max value
1ebde31 
Review comments
Fixes CURA-10096
@saumyaj3
Merge remote-tracking branch 'origin/CURA-10096_Multiply_Models_allow…
83bef10 
…s_entering_values_over_99_but_won't_multiply_higher_than_99' into CURA-10096_Multiply_Models_allows_entering_values_over_99_but_won't_multiply_higher_than_99
jellespijker
jellespijker requested changes Jul 7, 2023
View reviewed changes
Copy link
Member

@jellespijker jellespijker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You need to set the value property of base since the value of the spinBox is calculated from that value: Math.floor(base.value / base.stepSize) see L53

resources/qml/SpinBox.qml Outdated Show resolved Hide resolved
@saumyaj3 saumyaj3 self-assigned this Jul 7, 2023
@jellespijker jellespijker merged commit 15e0975 into main Jul 7, 2023
8 of 10 checks passed
@jellespijker jellespijker deleted the CURA-10096_Multiply_Models_allows_entering_values_over_99_but_won't_multiply_higher_than_99 branch July 7, 2023 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jellespijker jellespijker jellespijker approved these changes

Assignees

@saumyaj3 saumyaj3

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@saumyaj3 @jellespijker