Fix selection

LinwoodDev · Dec 15, 2024 · be13d38 · be13d38
1 parent 591f55d
commit be13d38
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 18 deletions.
diff --git a/app/lib/bloc/document_bloc.dart b/app/lib/bloc/document_bloc.dart
@@ -200,7 +200,7 @@ class DocumentBloc extends ReplayBloc<DocumentEvent, DocumentState> {
       if (!(current.embedding?.editable ?? true)) return;
       final cubit = current.currentIndexCubit;
       final renderers = <Renderer<PadElement>>[];
-      var selection = cubit.state.selection;
+      final selected = cubit.state.selection?.selected.toList();
       final page = current.page;
       final oldRenderers = current.renderers;
       final elements = event.elements.map((key, value) => MapEntry(
@@ -218,14 +218,9 @@ class DocumentBloc extends ReplayBloc<DocumentEvent, DocumentState> {
                 Renderer.fromInstance(element, current.currentLayer);
             renderers.add(newRenderer);
             updatedRenderers.add(newRenderer);
-            var newSelection = selection?.remove(renderer);
-            if (newSelection != selection && selection != null) {
-              if (newSelection == null) {
-                newSelection = Selection.from(newRenderer);
-              } else {
-                newSelection.insert(newRenderer);
-              }
-              selection = newSelection;
+            final exists = selected?.remove(renderer);
+            if (exists == true) {
+              selected?.add(newRenderer);
             }
           }
           replacedRenderers[renderer] = updatedRenderers;
@@ -242,7 +237,7 @@ class DocumentBloc extends ReplayBloc<DocumentEvent, DocumentState> {
               return [e];
             }).toList(),
           ));
-      cubit.changeSelection(selection, false);
+      cubit.changeSelection(Selection.fromList(selected), false);
       _saveState(
         emit,
         state: current.copyWith(

diff --git a/app/lib/dialogs/background/dialog.dart b/app/lib/dialogs/background/dialog.dart
@@ -49,7 +49,7 @@ class BackgroundDialog extends StatelessWidget {
                     tabAlignment: TabAlignment.fill,
                     tabs: [
                       (
-                        PhosphorIconsLight.globe,
+                        PhosphorIconsLight.gridFour,
                         AppLocalizations.of(context).general,
                       ),
                       (

diff --git a/app/lib/selections/properties/path.dart b/app/lib/selections/properties/path.dart
@@ -11,7 +11,7 @@ mixin PathPropertySelection<T extends PathProperty> on PropertySelection<T> {
         ExactSlider(
             header: Text(AppLocalizations.of(context).strokeWidth),
             value: property.strokeWidth,
-            min: 0,
+            min: 0.1,
             max: 70,
             defaultValue: 25,
             onChangeEnd: (value) => onChanged(

diff --git a/app/lib/selections/selection.dart b/app/lib/selections/selection.dart
@@ -70,6 +70,17 @@ abstract class Selection<T> {
     throw UnsupportedError('Unsupported selection type: $T');
   }
 
+  static Selection? fromList(List? selected) {
+    if (selected == null || selected.isEmpty) {
+      return null;
+    }
+    var current = Selection.from(selected.first);
+    for (final element in selected.sublist(1)) {
+      current = current.insert(element);
+    }
+    return current;
+  }
+
   String getLocalizedName(BuildContext context);
 
   IconGetter get icon;

diff --git a/app/lib/selections/tools/label.dart b/app/lib/selections/tools/label.dart
@@ -11,7 +11,7 @@ class LabelToolSelection extends ToolSelection<LabelTool> {
     return [
       ...super.buildProperties(context),
       ColorField(
-        value: Color(selected.first.foreground),
+        value: Color(selected.first.foreground).withAlpha(255),
         onChanged: (value) => update(
             context,
             selected

diff --git a/app/lib/selections/tools/shape.dart b/app/lib/selections/tools/shape.dart
@@ -83,7 +83,7 @@ class ShapeToolSelection extends ToolSelection<ShapeTool> {
                   .toList())),
       const SizedBox(height: 50),
       ColorField(
-        value: Color(property.color),
+        value: Color(property.color).withAlpha(255),
         onChanged: (color) => update(
             context,
             selected
@@ -237,7 +237,7 @@ class _CircleShapeView extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(children: [
       ColorField(
-        value: Color(shape.fillColor),
+        value: Color(shape.fillColor).withAlpha(255),
         title: Text(AppLocalizations.of(context).fill),
         leading: const PhosphorIcon(PhosphorIconsLight.paintBucket),
         defaultColor: Colors.transparent,
@@ -269,7 +269,7 @@ class _TriangleShapeView extends StatelessWidget {
   Widget build(BuildContext context) {
     return Column(children: [
       ColorField(
-        value: Color(shape.fillColor),
+        value: Color(shape.fillColor).withAlpha(255),
         title: Text(AppLocalizations.of(context).fill),
         leading: const PhosphorIcon(PhosphorIconsLight.paintBucket),
         defaultColor: Colors.transparent,
@@ -310,7 +310,7 @@ class _RectangleShapeViewState extends State<_RectangleShapeView> {
       ColorField(
         title: Text(AppLocalizations.of(context).fill),
         leading: const PhosphorIcon(PhosphorIconsLight.paintBucket),
-        value: Color(widget.shape.fillColor),
+        value: Color(widget.shape.fillColor).withAlpha(255),
         defaultColor: Colors.transparent,
         onChanged: (color) => widget.onChanged(widget.shape.copyWith(
             fillColor:

diff --git a/app/lib/selections/utilities.dart b/app/lib/selections/utilities.dart
@@ -230,7 +230,8 @@ class _UtilitiesViewState extends State<_UtilitiesView>
                             const SizedBox(height: 8),
                             ColorField(
                               title: Text(AppLocalizations.of(context).color),
-                              value: Color(widget.option.gridColor),
+                              value:
+                                  Color(widget.option.gridColor).withAlpha(255),
                               onChanged: (value) => widget.onToolChanged(
                                 widget.option.copyWith(
                                     gridColor: convertOldColor(

diff --git a/metadata/en-US/changelogs/124.txt b/metadata/en-US/changelogs/124.txt
@@ -25,6 +25,9 @@
 * Fix stamp don't use unique element ids
 * Fix render order when creating multiple elements when baking
 * Fix some color fields don't keep alpha value
+* FIx color fields preview shows alpha value
+* Fix min slider value of stroke width
+* Fix selection not working correctly when editing multiple elements
 * Show git hash instead of version in web version
 * Upgrade to flutter 3.27