This commit is contained in:
2026-03-21 11:35:32 +03:00
parent 1cfb0d2684
commit a221b53b75
@@ -30,7 +30,7 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
final mq = MediaQuery.of(widget.context); final mq = MediaQuery.of(widget.context);
final cardTop = mq.padding.top + kToolbarHeight + 16; final cardTop = mq.padding.top + kToolbarHeight + 16;
const cardHeight = 220.0; const cardHeight = 220.0;
final panelTop = cardTop + cardHeight + 82; final panelTop = cardTop + cardHeight + 65;
const panelHeight = 410.0; const panelHeight = 410.0;
return Material( return Material(
@@ -116,7 +116,7 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
: dash.tempSecondaryHSV; : dash.tempSecondaryHSV;
return Padding( return Padding(
padding: const EdgeInsets.fromLTRB(16, 14, 16, 14), padding: const EdgeInsets.fromLTRB(16, 14, 16, 22),
child: Column( child: Column(
mainAxisSize: MainAxisSize.max, mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -168,15 +168,10 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
), ),
), ),
GestureDetector( GestureDetector(
onTap: () { onTap: isSolid ? null : () {
dash.setState(() { dash.setState(() {
if (isSolid) { dash.tempGradientType = GradientType.solid;
dash.tempGradientType = GradientType.linear; dash.editingPrimary = true;
// keep editingPrimary as is when turning off
} else {
dash.tempGradientType = GradientType.solid;
dash.editingPrimary = true; // ALWAYS switch to primary when entering Solid
}
}); });
setPanelState(() {}); setPanelState(() {});
dash.overlayEntry?.markNeedsBuild(); dash.overlayEntry?.markNeedsBuild();
@@ -237,7 +232,7 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
Expanded( Expanded(
child: LayoutBuilder( child: LayoutBuilder(
builder: (lbCtx, constraints) { builder: (lbCtx, constraints) {
const reservedBelow = 66.0; const reservedBelow = 70.0;
final spectrumH = final spectrumH =
(constraints.maxHeight - reservedBelow).clamp( (constraints.maxHeight - reservedBelow).clamp(
40.0, double.infinity); 40.0, double.infinity);
@@ -258,11 +253,12 @@ class _FullScreenBlurOverlayState extends State<FullScreenBlurOverlay> {
), ),
), ),
const SizedBox(height: 8), const SizedBox(height: 8),
ClipRect( Padding(
child: SizedBox( padding: const EdgeInsets.only(bottom: 6),
height: 24, child: ClipRRect(
child: ClipRRect( borderRadius: BorderRadius.circular(6),
borderRadius: BorderRadius.circular(6), child: SizedBox(
height: 22,
child: ColorPickerSlider( child: ColorPickerSlider(
TrackType.hue, TrackType.hue,
currentHSV, currentHSV,