Wayland colorpicking

.github/workflows/build.yml

@@ -29,6 +29,14 @@ jobs:
           ../configure --prefix /usr
           make
           make install
+      - name: libportal-4.0 from source
+        run: |
+          git clone https://github.com/flatpak/libportal.git
+          cd libportal
+          git checkout f68764e
+          meson build
+          cd build
+          ninja install
       - name: Build
         # env:
         #   DESTDIR: out

build-aux/flatpak/com.github.akiraux.akira.json

@@ -23,7 +23,17 @@
     "--filesystem=xdg-run/gvfs",
     "--filesystem=xdg-run/gvfsd"
   ],
-  "modules": [{
+  "modules": [
+   {
+      "name": "libportal",
+      "buildsystem": "meson",
+      "sources": [{
+        "type": "git",
+        "url": "https://github.com/flatpak/libportal.git",
+        "tag": "0.4"
+      }]
+  },
+  {
       "name": "goocanvas",
       "config-opts": ["--enable-python=no"],
       "build-options": {

meson.build

@@ -22,6 +22,7 @@ cairo_dependency = dependency('cairo', version: '>=1.14')
 goocanvas_dependency = dependency('goocanvas-3.0')
 libarchive_dependency = dependency('libarchive')
 json_glib_dependency = dependency('json-glib-1.0')
+libportal_dependency = dependency('libportal')
 
 # Optional dependencies
 desktop_file_validate = find_program('desktop-file-validate', required: false)

src/Services/ActionManager.vala

@@ -470,19 +470,6 @@ public class Akira.Services.ActionManager : Object {
 
         bool is_holding_shift = false;
         var color_picker = new Akira.Utils.ColorPicker ();
-        color_picker.show_all ();
-
-        color_picker.key_pressed.connect (e => {
-            is_holding_shift = e.keyval == Gdk.Key.Shift_L;
-        });
-
-        color_picker.key_released.connect (e => {
-            is_holding_shift = e.keyval == Gdk.Key.Shift_L;
-        });
-
-        color_picker.cancelled.connect (() => {
-            color_picker.close ();
-        });
 
         color_picker.picked.connect (color => {
             foreach (var item in canvas.selected_bound_manager.selected_items) {
@@ -500,8 +487,6 @@ public class Akira.Services.ActionManager : Object {
                 item.fills.update_color_from_action (color);
             }
 
-            color_picker.close ();
-
             // Force a UI reload of the fills and borders panel since some items
             // had their properties changed.
             canvas.window.event_bus.selected_items_list_changed (canvas.selected_bound_manager.selected_items);