Merge branch 'alxsa-fixed-color-wheel' into 'master'

Draft: Issue #1147: Add option to lock color wheel rotation

See merge request GNOME/gimp!2022

.gitlab-ci.yml

@@ -541,8 +541,7 @@ gimp-snap:
     PKGCONF_RELOCATABLE_OPTION: '-Dpkgconfig.relocatable=true'
   before_script:
     - if (-not $env:MSYSTEM_PREFIX) { $env:MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' }}
-    # FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284
+    - $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX"
-    - $GIMP_PREFIX = "$PWD\_install-$env:MSYSTEM_PREFIX".Replace('\', '/')
   timeout: 30m
 
 .win_environ: &WIN_ENVIRON

build/linux/flatpak/org.gimp.GIMP-nightly.json

@@ -245,8 +245,8 @@
             "sources": [
                 {
                     "type": "archive",
-                    "url": "https://poppler.freedesktop.org/poppler-25.09.1.tar.xz",
+                    "url": "https://poppler.freedesktop.org/poppler-25.10.0.tar.xz",
-                    "sha256": "0c1091d01d3dd1664a13816861e812d02b29201e96665454b81b52d261fad658",
+                    "sha256": "6b5e9bb64dabb15787a14db1675291c7afaf9387438cc93a4fb7f6aec4ee6fe0",
                     "x-checker-data": {
                         "type": "anitya",
                         "project-id": 3686,

build/windows/2_build-gimp-msys2.ps1

@@ -32,8 +32,7 @@ if ($GITLAB_CI)
 # Prepare env
 if (-not $GIMP_PREFIX)
   {
-    #FIXME:'gimpenv' have buggy code about Windows paths. See: https://gitlab.gnome.org/GNOME/gimp/-/issues/12284
+    $GIMP_PREFIX = "$PWD\..\_install"
-    $GIMP_PREFIX = "$PWD\..\_install".Replace('\', '/')
   }
 Invoke-Expression ((Get-Content .gitlab-ci.yml | Select-String 'win_environ\[' -Context 0,7) -replace '> ','' -replace '- ','')
 

meson.build

@@ -128,7 +128,7 @@ fs        = import('fs')
 
 cc        = meson.get_compiler('c')
 cxx       = meson.get_compiler('cpp')
-prefix    = get_option('prefix')
+prefix    = get_option('prefix').replace('\\', '/')
 buildtype = get_option('buildtype')
 exec_ver  = '-' + gimp_app_version
 

modules/gimpcolorwheel.c

@@ -81,6 +81,7 @@ typedef struct
 
   /* Dragging mode */
   DragMode mode;
+  gboolean triangle_locked;
 
   guint focus_on_ring : 1;
 
@@ -234,10 +235,11 @@ gimp_color_wheel_init (GimpColorWheel *wheel)
   gtk_widget_set_has_window (GTK_WIDGET (wheel), FALSE);
   gtk_widget_set_can_focus (GTK_WIDGET (wheel), TRUE);
 
-  priv->format        = NULL;
+  priv->format          = NULL;
-  priv->ring_fraction = DEFAULT_FRACTION;
+  priv->ring_fraction   = DEFAULT_FRACTION;
-  priv->size          = DEFAULT_SIZE;
+  priv->size            = DEFAULT_SIZE;
-  priv->ring_width    = DEFAULT_RING_WIDTH;
+  priv->ring_width      = DEFAULT_RING_WIDTH;
+  priv->triangle_locked = TRUE;
 
   /* Allow the user to drag the rectangle on the preview */
   gesture = gtk_gesture_drag_new (GTK_WIDGET (wheel));
@@ -500,7 +502,11 @@ compute_triangle (GimpColorWheel *wheel,
 
   outer = priv->size / 2.0;
   inner = outer - priv->ring_width;
-  angle = priv->h * 2.0 * G_PI;
+
+  if (! priv->triangle_locked)
+    angle = priv->h * 2.0 * G_PI;
+  else
+    angle = 90 * G_PI;
 
   *hx = floor (center_x + cos (angle) * inner + 0.5);
   *hy = floor (center_y - sin (angle) * inner + 0.5);
@@ -1538,3 +1544,15 @@ gimp_color_wheel_move (GimpColorWheel   *wheel,
 
   gimp_color_wheel_set_color (wheel, hue, sat, val);
 }
+
+void
+gimp_color_wheel_set_triangle_locked (GimpColorWheel  *wheel,
+                                      gboolean         triangle_locked)
+{
+  GimpColorWheelPrivate *priv = gimp_color_wheel_get_instance_private (wheel);
+
+  g_return_if_fail (GIMP_IS_COLOR_WHEEL (wheel));
+
+  priv->triangle_locked = triangle_locked;
+}
+

modules/gimpcolorwheel.h

@@ -66,29 +66,31 @@ struct _GimpColorWheelClass
 };
 
 
-void        color_wheel_register_type          (GTypeModule     *module);
+void        color_wheel_register_type            (GTypeModule     *module);
 
-GType       gimp_color_wheel_get_type          (void) G_GNUC_CONST;
+GType       gimp_color_wheel_get_type            (void) G_GNUC_CONST;
-GtkWidget * gimp_color_wheel_new               (void);
+GtkWidget * gimp_color_wheel_new                 (void);
 
-void        gimp_color_wheel_set_color         (GimpColorWheel  *wheel,
+void        gimp_color_wheel_set_color           (GimpColorWheel  *wheel,
-                                                double           h,
+                                                  double           h,
-                                                double           s,
+                                                  double           s,
-                                                double           v);
+                                                  double           v);
-void        gimp_color_wheel_get_color         (GimpColorWheel  *wheel,
+void        gimp_color_wheel_get_color           (GimpColorWheel  *wheel,
-                                                gfloat          *h,
+                                                  gfloat          *h,
-                                                gfloat          *s,
+                                                  gfloat          *s,
-                                                gfloat          *v);
+                                                  gfloat          *v);
 
-void        gimp_color_wheel_set_ring_fraction (GimpColorWheel  *wheel,
+void        gimp_color_wheel_set_ring_fraction   (GimpColorWheel  *wheel,
-                                                gdouble          fraction);
+                                                  gdouble          fraction);
-gdouble     gimp_color_wheel_get_ring_fraction (GimpColorWheel  *wheel);
+gdouble     gimp_color_wheel_get_ring_fraction   (GimpColorWheel  *wheel);
 
-void        gimp_color_wheel_set_format        (GimpColorWheel  *wheel,
+void        gimp_color_wheel_set_format          (GimpColorWheel  *wheel,
-                                                const Babl      *format);
+                                                  const Babl      *format);
-void        gimp_color_wheel_set_color_config  (GimpColorWheel  *wheel,
+void        gimp_color_wheel_set_color_config    (GimpColorWheel  *wheel,
-                                                GimpColorConfig *config);
+                                                  GimpColorConfig *config);
+void        gimp_color_wheel_set_triangle_locked (GimpColorWheel  *wheel,
+                                                  gboolean         triangle_locked);
 
-gboolean    gimp_color_wheel_is_adjusting      (GimpColorWheel  *wheel);
+gboolean    gimp_color_wheel_is_adjusting        (GimpColorWheel  *wheel);
 
 G_END_DECLS