Merge branch 'main' into MoveSelectionToAnotherPage

Author: QubaB

README.md

@@ -239,6 +239,11 @@
     </screenshots>
 
     <releases>
+        <release version="0.19.2" type="development" date="2024-01-16">
+            <description>
+                <p>Strokes that had jagged edges have now been smoothed out, particularly ones drawn with a mouse or trackpad.</p>
+            </description>
+        </release>
         <release version="0.19.1" type="development" date="2024-01-09">
             <description>
                 <ul>

flatpak/com.adilhanney.saber.metainfo.xml

@@ -2,7 +2,7 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "Saber"
-#define MyAppVersion "0.19.1"
+#define MyAppVersion "0.19.2"
 #define MyAppPublisher "Adil Hanney"
 #define MyAppURL "https://github.com/saber-notes/saber"
 #define MyAppExeName "saber.exe"

installers/desktop_inno_script.iss

@@ -93,7 +93,7 @@ class CircleStroke extends Stroke {
         .map((radians) => Offset(cos(radians), sin(radians)))
         .map((unitDir) => unitDir * radius + center)
         .toList();
-    _path = Path()..addPolygon(_polygon, true);
+    _path = Path()..addOval(Rect.fromCircle(center: center, radius: radius));
     _polygonNeedsUpdating = false;
   }
 

lib/components/canvas/_circle_stroke.dart

@@ -89,7 +89,7 @@ class RectangleStroke extends Stroke {
 
   void _updatePolygon() {
     _polygon = _getPolygon();
-    _path = Path()..addPolygon(_polygon, true);
+    _path = Path()..addRect(rect);
     _polygonNeedsUpdating = false;
   }
 

lib/components/canvas/_rectangle_stroke.dart

@@ -46,7 +46,7 @@ class Stroke {
 
   void _updatePolygon() {
     _polygon = _getPolygon();
-    _path = Path()..addPolygon(_polygon, true);
+    _path = _getPath();
     _polygonNeedsUpdating = false;
   }
 
@@ -174,6 +174,9 @@ class Stroke {
 
     final minDistance = options.size * thresholdMultiplier;
 
+    // Remove points with null pressure because they were duplicates
+    points.removeWhere((point) => point.pressure == null);
+
     for (int i = 1; i < points.length - 1; i++) {
       final point = points[i];
       final prev = points[i - 1];
@@ -203,8 +206,6 @@ class Stroke {
     if (rememberSimulatedPressure) {
       // Ensure we don't simulate pressure again
       options.simulatePressure = false;
-      // Remove points with null pressure because they were duplicates
-      points.removeWhere((point) => point.pressure == null);
       // Remove points that are too close together
       optimisePoints();
       // Get polygon again with slightly different input
@@ -214,6 +215,29 @@ class Stroke {
     return polygon;
   }
 
+  /// Returns a [Path] that represents the stroke.
+  ///
+  /// If the stroke is not complete,
+  /// the path will just follow the polygon for performance.
+  ///
+  /// If the stroke is complete,
+  /// the path will be a smooth curve between the points.
+  Path _getPath() {
+    if (!options.isComplete) {
+      return Path()..addPolygon(_polygon, true);
+    }
+
+    final path = Path();
+    path.moveTo(_polygon.first.dx, _polygon.first.dy);
+    for (int i = 1; i < _polygon.length - 1; i++) {
+      final p1 = _polygon[i];
+      final p2 = _polygon[i + 1];
+      final mid = (p1 + p2) / 2;
+      path.quadraticBezierTo(p1.dx, p1.dy, mid.dx, mid.dy);
+    }
+    return path..close();
+  }
+
   String toSvgPath(Size pageSize) {
     String toSvgPoint(Offset point) {
       return '${point.dx} '

lib/components/canvas/_stroke.dart

@@ -73,7 +73,9 @@ class Pen extends Tool {
     currentStroke = Stroke(
       color: color,
       pressureEnabled: pressureEnabled,
-      options: options.copyWith(),
+      options: options.copyWith(
+        isComplete: false,
+      ),
       pageIndex: pageIndex,
       penType: runtimeType.toString(),
     );

lib/data/tools/pen.dart

@@ -2,10 +2,10 @@
 // Run `./scripts/apply_version.sh --help` for more information.
 
 /// The current app version as an ordinal number.
-const int buildNumber = 19010;
+const int buildNumber = 19020;
 
 /// The current app version as a string.
-const String buildName = '0.19.1';
+const String buildName = '0.19.2';
 
 /// The year in which the current version was released.
 const int buildYear = 2024;

lib/data/version.dart

@@ -0,0 +1,2 @@
+وقد تم الآن سلاسة الخنقات التي كانت تحمل حوافاً مزيفة، لا سيما تلك التي تم سحبها مع فأر أو صعقة.
+.

metadata/ar/changelogs/19020.txt

@@ -0,0 +1 @@
+metadata/ar/changelogs/19020.txt