From 29e807a7b037595d4f60d3d1de7e2abd9024209b Mon Sep 17 00:00:00 2001
From: Sophie Herold <sophie@hemio.de>
Date: Thu, 23 Jan 2025 14:06:30 +0100
Subject: [PATCH] edit/crop: Implement crop apply as overlay

---
 data/resources/edit_crop.css       |   5 --
 src/widgets/edit/crop_selection.rs |   7 ++
 src/widgets/edit/crop_selection.ui | 138 +++++++++++++++--------------
 3 files changed, 78 insertions(+), 72 deletions(-)

diff --git a/data/resources/edit_crop.css b/data/resources/edit_crop.css
index 4e810dc..8aa7219 100644
--- a/data/resources/edit_crop.css
+++ b/data/resources/edit_crop.css
@@ -45,9 +45,4 @@ lpcrop {
 
 .discarded-area {
   background: var(--discarded-background);
-}
-
-.apply-button {
-  margin-right: 12px;
-  margin-top: -6px;
 }
\ No newline at end of file
diff --git a/src/widgets/edit/crop_selection.rs b/src/widgets/edit/crop_selection.rs
index 425b655..d0ea260 100644
--- a/src/widgets/edit/crop_selection.rs
+++ b/src/widgets/edit/crop_selection.rs
@@ -214,6 +214,13 @@ mod imp {
             let obj = self.obj();
 
             obj.set_direction(gtk::TextDirection::Ltr);
+            self.selection.set_direction(gtk::TextDirection::Ltr);
+            self.handle_bottom_left
+                .set_direction(gtk::TextDirection::Ltr);
+            self.handle_bottom_right
+                .set_direction(gtk::TextDirection::Ltr);
+            self.handle_top_left.set_direction(gtk::TextDirection::Ltr);
+            self.handle_top_right.set_direction(gtk::TextDirection::Ltr);
 
             // List of widgets that are drag handles
             let drag_corners = std::collections::BTreeMap::from([
diff --git a/src/widgets/edit/crop_selection.ui b/src/widgets/edit/crop_selection.ui
index 8f9a5a3..bd7f3df 100644
--- a/src/widgets/edit/crop_selection.ui
+++ b/src/widgets/edit/crop_selection.ui
@@ -98,55 +98,22 @@
       </object>
     </child>
     <child>
-      <object class="GtkGrid" id="selection">
+      <object class="GtkOverlay">
         <property name="hexpand-set">true</property>
         <property name="vexpand-set">true</property>
         <layout>
           <property name="row">1</property>
           <property name="column">1</property>
         </layout>
-        <style>
-          <class name="selection" />
-        </style>
-        <child>
-          <object class="AdwBin" id="handle_top_left">
-            <property name="halign">start</property>
-            <property name="valign">start</property>
-            <layout>
-              <property name="row">0</property>
-              <property name="column">0</property>
-            </layout>
-            <style>
-              <class name="handle" />
-              <class name="handle-top-left" />
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="AdwBin" id="handle_top_right">
-            <property name="halign">end</property>
-            <property name="hexpand">true</property>
-            <layout>
-              <property name="row">0</property>
-              <property name="column">2</property>
-            </layout>
-            <style>
-              <class name="handle" />
-              <class name="handle-top-right" />
-            </style>
-          </object>
-        </child>
-        <child>
+        <child type="overlay">
           <object class="GtkButton" id="apply_button">
-            <property name="hexpand">true</property>
-            <layout>
-              <property name="row">1</property>
-              <property name="column">2</property>
-            </layout>
+            <property name="halign">end</property>
+            <property name="valign">start</property>
+            <property name="margin-end">12</property>
+            <property name="margin-top">12</property>
             <property name="action-name">edit-crop.apply-crop</property>
             <property name="icon-name">apply-crop</property>
-            <property name="halign">end</property>
-            <property name="valign">start</property>
+            <property name="tooltip-text" translatable="yes">Crop Selection</property>
             <style>
               <class name="circular" />
               <class name="osd" />
@@ -154,36 +121,73 @@
             </style>
           </object>
         </child>
-        <child>
-          <object class="AdwBin" id="handle_bottom_left">
-            <property name="valign">end</property>
-            <property name="vexpand">true</property>
-            <layout>
-              <property name="row">2</property>
-              <property name="column">0</property>
-            </layout>
+        <property name="child">
+          <object class="GtkGrid" id="selection">
+            <property name="hexpand-set">true</property>
+            <property name="vexpand-set">true</property>
             <style>
-              <class name="handle" />
-              <class name="handle-bottom-left" />
+              <class name="selection" />
             </style>
+            <child>
+              <object class="AdwBin" id="handle_top_left">
+                <property name="halign">start</property>
+                <property name="valign">start</property>
+                <layout>
+                  <property name="row">0</property>
+                  <property name="column">0</property>
+                </layout>
+                <style>
+                  <class name="handle" />
+                  <class name="handle-top-left" />
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="AdwBin" id="handle_top_right">
+                <property name="halign">end</property>
+                <property name="hexpand">true</property>
+                <layout>
+                  <property name="row">0</property>
+                  <property name="column">1</property>
+                </layout>
+                <style>
+                  <class name="handle" />
+                  <class name="handle-top-right" />
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="AdwBin" id="handle_bottom_left">
+                <property name="valign">end</property>
+                <property name="vexpand">true</property>
+                <layout>
+                  <property name="row">1</property>
+                  <property name="column">0</property>
+                </layout>
+                <style>
+                  <class name="handle" />
+                  <class name="handle-bottom-left" />
+                </style>
+              </object>
+            </child>
+            <child>
+              <object class="AdwBin" id="handle_bottom_right">
+                <property name="halign">end</property>
+                <property name="hexpand">true</property>
+                <property name="valign">end</property>
+                <property name="vexpand">true</property>
+                <layout>
+                  <property name="row">1</property>
+                  <property name="column">1</property>
+                </layout>
+                <style>
+                  <class name="handle" />
+                  <class name="handle-bottom-right" />
+                </style>
+              </object>
+            </child>
           </object>
-        </child>
-        <child>
-          <object class="AdwBin" id="handle_bottom_right">
-            <property name="halign">end</property>
-            <property name="hexpand">true</property>
-            <property name="valign">end</property>
-            <property name="vexpand">true</property>
-            <layout>
-              <property name="row">2</property>
-              <property name="column">2</property>
-            </layout>
-            <style>
-              <class name="handle" />
-              <class name="handle-bottom-right" />
-            </style>
-          </object>
-        </child>
+        </property>
       </object>
     </child>
   </template>