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

fix: MaterialOutlinedTextBoxStyle layout #1494

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+191 −172
Open

fix: MaterialOutlinedTextBoxStyle layout #1494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc6a872
chore: fix a TreeGraph crash
Xiaoy312 Oct 25, 2024
d599aaf
fix: MaterialOutlinedTextBoxStyle layout
Xiaoy312 Oct 25, 2024
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
146 changes: 73 additions & 73 deletions doc/styles/TextBox.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,83 +7,83 @@ uid: Uno.Themes.Styles.TextBox
## Styles

| Style Key | IsDefaultStyle\* |
|------------------------|------------------|
| ---------------------- | ---------------- |
| `FilledTextBoxStyle` | |
| `OutlinedTextBoxStyle` | True |

IsDefaultStyle\*: Styles in this column will be set as the default implicit style for the matching control

## Lightweight Styling

| Key | Type | Value |
|---------------------------------------------------|-------------------|-------------------------------|
| `TextBoxDeleteButtonForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `TextBoxDeleteButtonForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `TextBoxDeleteButtonForegroundPressed` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `TextBoxDeleteButtonForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `TextBoxLeadingIconForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `TextBoxLeadingIconForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `FilledTextBoxBackground` | `SolidColorBrush` | `SurfaceVariantBrush` |
| `FilledTextBoxBackgroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantHoverBrush` |
| `FilledTextBoxBackgroundFocused` | `SolidColorBrush` | `SurfaceVariantBrush` |
| `FilledTextBoxBackgroundDisabled` | `SolidColorBrush` | `OnSurfaceDisabledBrush` |
| `FilledTextBoxBorderBrush` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxBorderBrushPointerOver` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxBorderBrushFocused` | `SolidColorBrush` | `PrimaryBrush` |
| `FilledTextBoxBorderBrushDisabled` | `SolidColorBrush` | `OnSurfaceDisabledBrush` |
| `FilledTextBoxDeleteButtonForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxDeleteButtonForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxDeleteButtonForegroundFocused` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxDeleteButtonForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `FilledTextBoxForeground` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxForegroundFocused` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxForegroundDisabled` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxForegroundOpacityDisabled` | `Double` | `LowOpacity` |
| `FilledTextBoxPlaceholderForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxPlaceholderForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxPlaceholderForegroundFocused` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxPlaceholderForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `FilledTextBoxHeaderForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxHeaderForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxHeaderForegroundFocused` | `SolidColorBrush` | `PrimaryBrush` |
| `FilledTextBoxHeaderForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `OutlinedTextBoxBorderBrush` | `SolidColorBrush` | `OutlineBrush` |
| `OutlinedTextBoxBorderBrushPointerOver` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxBorderBrushFocused` | `SolidColorBrush` | `PrimaryBrush` |
| `OutlinedTextBoxBorderBrushDisabled` | `SolidColorBrush` | `OnSurfaceDisabledBrush` |
| `OutlinedTextBoxForeground` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxForegroundFocused` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxForegroundDisabled` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxForegroundOpacityDisabled` | `Double` | `LowOpacity` |
| `OutlinedTextBoxPlaceholderForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `OutlinedTextBoxPlaceholderForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `OutlinedTextBoxPlaceholderForegroundFocused` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxPlaceholderForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `OutlinedTextBoxHeaderForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `OutlinedTextBoxHeaderForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `OutlinedTextBoxHeaderForegroundFocused` | `SolidColorBrush` | `PrimaryBrush` |
| `OutlinedTextBoxHeaderForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `OutlinedTextBoxFontFamily` | `FontFamily` | `BodyLargeFontFamily` |
| `OutlinedTextBoxFontWeight` | `String` | `BodyLargeFontWeight` |
| `OutlinedTextBoxFontSize` | `Double` | `BodyLargeFontSize` |
| `OutlinedTextBoxCharacterSpacing` | `Int32` | `BodyLargeCharacterSpacing` |
| `FilledTextBoxFontFamily` | `FontFamily` | `BodyLargeFontFamily` |
| `FilledTextBoxFontWeight` | `String` | `BodyLargeFontWeight` |
| `FilledTextBoxFontSize` | `Double` | `BodyLargeFontSize` |
| `FilledTextBoxCharacterSpacing` | `Int32` | `BodyLargeCharacterSpacing` |
| `FilledTextBoxBorderThicknessNormal` | `Double` | `TextBoxOutlinedStrokeHeight` |
| `FilledTextBoxBorderThicknessFocused` | `Double` | `TextBoxFocusStrokeWidth` |
| `MaterialTextBoxClearGlyphWidth` | `Double` | 20 |
| `MaterialTextBoxClearGlyphHeight` | `Double` | 20 |
| `MaterialFilledTextBoxCornerRadius` | `CornerRadius` | 4,4,0,0 |
| `MaterialFilledTextBoxPadding` | `Thickness` | 16,8 |
| `MaterialFilledTextBoxMinHeight` | `Double` | 58 |
| `MaterialFilledTextBoxBorderHeightFocused` | `Double` | 2 |
| `MaterialOutlinedTextBoxBorderThickness` | `Double` | 1 |
| `MaterialOutlinedTextBoxCornerRadius` | `CornerRadius` | 4 |
| `MaterialOutlinedTextBoxPadding` | `Thickness` | 16,8 |
| `MaterialOutlinedTextBoxMinHeight` | `Double` | 56 |
| `MaterialOutlinedTextBoxBorderPadding` | `Thickness` | 1 |
| `MaterialOutlinedTextBoxBorderThicknessFocused` | `Double` | 2 |
| Key | Type | Value |
| --------------------------------------------------- | ----------------- | ----------------------------- |
| `TextBoxDeleteButtonForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `TextBoxDeleteButtonForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `TextBoxDeleteButtonForegroundPressed` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `TextBoxDeleteButtonForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `TextBoxLeadingIconForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `TextBoxLeadingIconForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `FilledTextBoxBackground` | `SolidColorBrush` | `SurfaceVariantBrush` |
| `FilledTextBoxBackgroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantHoverBrush` |
| `FilledTextBoxBackgroundFocused` | `SolidColorBrush` | `SurfaceVariantBrush` |
| `FilledTextBoxBackgroundDisabled` | `SolidColorBrush` | `OnSurfaceDisabledBrush` |
| `FilledTextBoxBorderBrush` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxBorderBrushPointerOver` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxBorderBrushFocused` | `SolidColorBrush` | `PrimaryBrush` |
| `FilledTextBoxBorderBrushDisabled` | `SolidColorBrush` | `OnSurfaceDisabledBrush` |
| `FilledTextBoxDeleteButtonForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxDeleteButtonForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxDeleteButtonForegroundFocused` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxDeleteButtonForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `FilledTextBoxForeground` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxForegroundFocused` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxForegroundDisabled` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxForegroundOpacityDisabled` | `Double` | `LowOpacity` |
| `FilledTextBoxPlaceholderForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxPlaceholderForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxPlaceholderForegroundFocused` | `SolidColorBrush` | `OnSurfaceBrush` |
| `FilledTextBoxPlaceholderForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `FilledTextBoxHeaderForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxHeaderForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `FilledTextBoxHeaderForegroundFocused` | `SolidColorBrush` | `PrimaryBrush` |
| `FilledTextBoxHeaderForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `OutlinedTextBoxBorderBrush` | `SolidColorBrush` | `OutlineBrush` |
| `OutlinedTextBoxBorderBrushPointerOver` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxBorderBrushFocused` | `SolidColorBrush` | `PrimaryBrush` |
| `OutlinedTextBoxBorderBrushDisabled` | `SolidColorBrush` | `OnSurfaceDisabledBrush` |
| `OutlinedTextBoxForeground` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxForegroundFocused` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxForegroundDisabled` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxForegroundOpacityDisabled` | `Double` | `LowOpacity` |
| `OutlinedTextBoxPlaceholderForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `OutlinedTextBoxPlaceholderForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `OutlinedTextBoxPlaceholderForegroundFocused` | `SolidColorBrush` | `OnSurfaceBrush` |
| `OutlinedTextBoxPlaceholderForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `OutlinedTextBoxHeaderForeground` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `OutlinedTextBoxHeaderForegroundPointerOver` | `SolidColorBrush` | `OnSurfaceVariantBrush` |
| `OutlinedTextBoxHeaderForegroundFocused` | `SolidColorBrush` | `PrimaryBrush` |
| `OutlinedTextBoxHeaderForegroundDisabled` | `SolidColorBrush` | `OnSurfaceLowBrush` |
| `OutlinedTextBoxFontFamily` | `FontFamily` | `MaterialMediumFontFamily` |
| `OutlinedTextBoxFontWeight` | `String` | `BodyLargeFontWeight` |
| `OutlinedTextBoxFontSize` | `Double` | `BodyLargeFontSize` |
| `OutlinedTextBoxCharacterSpacing` | `Int32` | `BodyLargeCharacterSpacing` |
| `FilledTextBoxFontFamily` | `FontFamily` | `MaterialMediumFontFamily` |
| `FilledTextBoxFontWeight` | `String` | `BodyLargeFontWeight` |
| `FilledTextBoxFontSize` | `Double` | `BodyLargeFontSize` |
| `FilledTextBoxCharacterSpacing` | `Int32` | `BodyLargeCharacterSpacing` |
| `FilledTextBoxBorderThicknessNormal` | `Double` | `TextBoxOutlinedStrokeHeight` |
| `FilledTextBoxBorderThicknessFocused` | `Double` | `TextBoxFocusStrokeWidth` |
| `MaterialTextBoxClearGlyphWidth` | `Double` | 20 |
| `MaterialTextBoxClearGlyphHeight` | `Double` | 20 |
| `MaterialFilledTextBoxCornerRadius` | `CornerRadius` | 4,4,0,0 |
| `MaterialFilledTextBoxPadding` | `Thickness` | 16,7 |
| `MaterialFilledTextBoxMinHeight` | `Double` | 58 |
| `MaterialFilledTextBoxBorderHeightFocused` | `Double` | 2 |
| `MaterialOutlinedTextBoxBorderThickness` | `Double` | 1 |
| `MaterialOutlinedTextBoxCornerRadius` | `CornerRadius` | 4 |
| `MaterialOutlinedTextBoxPadding` | `Thickness` | 8 |
| `MaterialOutlinedTextBoxMinHeight` | `Double` | 56 |
| `MaterialOutlinedTextBoxBorderThicknessFocused` | `Double` | 2 |
| `MaterialOutlinedTextBoxBorderThicknessPointerOver` | `Double` | 2 |
Xiaoy312 marked this conversation as resolved.
Show resolved Hide resolved
Loading
Loading