Skip to content

Commit

Permalink
Button color
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianos42 committed May 3, 2021
1 parent 91476fa commit 75644e9
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 12 deletions.
4 changes: 4 additions & 0 deletions desktop/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 2.0.4

- Button color.

## 2.0.3

- Fixed button highlight color.
Expand Down
2 changes: 1 addition & 1 deletion desktop/lib/src/desktop/input/checkbox.dart
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@ class _RenderCheckbox extends RenderConstrainedBox {
required Color hoverColor,
required bool hovering,
required BoxConstraints additionalConstraints,
}) : _state = state,
}) : _state = state,
_value = value,
_oldValue = value,
_activeColor = activeColor,
Expand Down
2 changes: 1 addition & 1 deletion desktop/lib/src/desktop/input/slider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ class _RenderSlider extends RenderConstrainedBox {
required bool hovering,
required Color trackColor,
required TextDirection textDirection,
}) : assert(value >= 0.0 && value <= 1.0),
}) : assert(value >= 0.0 && value <= 1.0),
_disabledColor = disabledColor,
_hoverColor = hoverColor,
_hovering = hovering,
Expand Down
2 changes: 1 addition & 1 deletion desktop/lib/src/desktop/input/toggle_switch.dart
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ class _RenderToggleSwitch extends RenderConstrainedBox {
required Color hoverColor,
required bool hovering,
required BoxConstraints additionalConstraints,
}) : _state = state,
}) : _state = state,
_value = value,
_activeColor = activeColor,
_disabledColor = disabledColor,
Expand Down
2 changes: 1 addition & 1 deletion desktop/lib/src/desktop/navigation/nav_button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ class _RenderIconSide extends RenderConstrainedBox {
required this.axis,
required this.crossLength,
required this.lengths,
}) : _oldIndex = index,
}) : _oldIndex = index,
_index = index,
_vsync = vsync,
super(additionalConstraints: additionalConstraints) {
Expand Down
2 changes: 1 addition & 1 deletion desktop/lib/src/desktop/navigation/tab_list.dart
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class TabList extends StatefulWidget {
const TabList({
Key? key,
required this.tabItems,
}) : assert(tabItems.length > 0),
}) : assert(tabItems.length > 0),
super(key: key);

final List<TabListItem> tabItems;
Expand Down
6 changes: 3 additions & 3 deletions desktop/lib/src/desktop/scrolling/scrollbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ class _ScrollbarState extends State<Scrollbar>

WidgetsBinding.instance!.addPostFrameCallback((Duration duration) {
if (!_hideScroll) {
assert(widget.controller != null); // TODO(as):
assert(widget.controller != null); // TODO(as):
widget.controller!.position.didUpdateScrollPositionBy(0);
}
});
Expand Down Expand Up @@ -564,7 +564,7 @@ class _ThumbVerticalDragGestureRecognizer
PointerDeviceKind? kind,
Object? debugOwner,
required GlobalKey customPaintKey,
}) : _customPaintKey = customPaintKey,
}) : _customPaintKey = customPaintKey,
super(
kind: kind,
debugOwner: debugOwner,
Expand All @@ -590,7 +590,7 @@ class _TapGestureRecognizer extends TapGestureRecognizer {
_TapGestureRecognizer({
Object? debugOwner,
required GlobalKey customPaintKey,
}) : _customPaintKey = customPaintKey,
}) : _customPaintKey = customPaintKey,
super(
debugOwner: debugOwner,
);
Expand Down
2 changes: 1 addition & 1 deletion desktop/lib/src/desktop/status/progress_indicator.dart
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@ class _CircularProgressIndicatorPainter extends CustomPainter {
required this.stepValue,
required this.rotationValue,
required this.strokeWidth,
}) : arcStart = value != null
}) : arcStart = value != null
? _startAngle
: _startAngle +
tailValue * 3 / 2 * math.pi +
Expand Down
4 changes: 2 additions & 2 deletions desktop/lib/src/desktop/theme/button.dart
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,8 @@ class ButtonTheme extends InheritedTheme {
final HSLColor hoverColor =
buttonThemeData.hoverColor ?? textTheme.textHigh;

final HSLColor highlightColor = buttonThemeData.highlightColor ??
colorScheme.shadeColorFromLightness(colorScheme.primary);
final HSLColor highlightColor =
buttonThemeData.highlightColor ?? colorScheme.primary;

final HSLColor disabledColor =
buttonThemeData.disabledColor ?? colorScheme.disabled;
Expand Down
2 changes: 1 addition & 1 deletion desktop/pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: desktop
description: Flutter design standard for desktop. Just simple, usable wigdets to create apps. See the galery for examples of the components used.
repository: https://github.com/adrianos42/desktop
homepage: https://adrianos42.github.io/desktop
version: 2.0.3
version: 2.0.4

environment:
sdk: '>=2.12.0-0 <3.0.0'
Expand Down

0 comments on commit 75644e9

Please sign in to comment.