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

[SettingsControls] Bugfix for wrapping states #252

Merged
merged 6 commits into from
Nov 28, 2023
Merged

[SettingsControls] Bugfix for wrapping states #252

merged 6 commits into from
Nov 28, 2023

Conversation

niels9001
Copy link
Collaborator

@niels9001 niels9001 commented Oct 5, 2023 •
edited
Loading

Addressing: #219

Before, when resizing a card where the Content is not set or Content is set but no Header + Description the spacing would be applied, resulting in #219.

Before:
image

After:
image

To test:

  • Add the following XAML to a sample and resize the window:
 <controls:SettingsCard >
     <ComboBox SelectedIndex="0">
         <ComboBoxItem>Option 1</ComboBoxItem>
         <ComboBoxItem>Option 2</ComboBoxItem>
         <ComboBoxItem>Option 3</ComboBoxItem>
     </ComboBox>
 </controls:SettingsCard>

@niels9001 niels9001 changed the title [SettingsControls] Bugfixes [SettingsControls] Bugfix for wrapping states Oct 6, 2023
@niels9001 niels9001 marked this pull request as ready for review October 6, 2023 15:04
@niels9001
Copy link
Collaborator Author

FYI @0x5bfa

@niels9001 niels9001 mentioned this pull request Oct 6, 2023
Closed
14 tasks
0x5bfa
0x5bfa approved these changes Oct 21, 2023
View reviewed changes
Copy link

@0x5bfa 0x5bfa left a comment

Choose a reason for hiding this comment

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

Thank you for fixing instead of me!

Arlodotexe
Arlodotexe reviewed Nov 2, 2023
View reviewed changes
Copy link
Member

@Arlodotexe Arlodotexe left a comment

Choose a reason for hiding this comment

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

Tested locally, think we're seeing a bit too much extra space now?

image

@niels9001
Copy link
Collaborator Author

@Arlodotexe Fixed the issue where whenever a custom SettingsCardWrapThreshold would be set and the control size would be lower than that, that the spacing would not be added. On load we're checking the state now and make sure the spacing is added.

Should be all good now!

Arlodotexe
Arlodotexe approved these changes Nov 14, 2023
View reviewed changes
Copy link
Member

@Arlodotexe Arlodotexe left a comment

Choose a reason for hiding this comment

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

Checked on Uwp and Wasm. Looks much better, good to go!

image

@Arlodotexe Arlodotexe enabled auto-merge (squash) November 14, 2023 00:24
@michael-hawker
Copy link
Member

Going to close and re-open to rekick CI

auto-merge was automatically disabled November 21, 2023 18:17

Pull request was closed

@Arlodotexe Arlodotexe closed this Nov 21, 2023
@Arlodotexe Arlodotexe reopened this Nov 21, 2023
@niels9001 niels9001 merged commit b076b7e into main Nov 28, 2023
15 checks passed
@delete-merged-branch delete-merged-branch bot deleted the niels9001/settingscontrols-wrapping-fix branch November 28, 2023 10:58
@niels9001 niels9001 mentioned this pull request Nov 28, 2023
Closed
20 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Arlodotexe Arlodotexe Arlodotexe approved these changes

@0x5bfa 0x5bfa 0x5bfa approved these changes

@michael-hawker michael-hawker Awaiting requested review from michael-hawker

Assignees

@niels9001 niels9001

Labels
None yet
Projects
Toolkit 8.x
Status: ✅ Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@niels9001 @michael-hawker @Arlodotexe @0x5bfa