2 pixel wide border

This patch adds an additional check if the foreground or
background color are selected, and only show the highlight
if that color is selected. This should make it more visually
apparent which color you have selected in the Color
dockable.

app/widgets/gimpfgbgeditor.c

@@ -27,6 +27,7 @@
 
 #include "libgimpbase/gimpbase.h"
 #include "libgimpcolor/gimpcolor.h"
+#include "libgimpcolor/gimpcolor-private.h"
 #include "libgimpconfig/gimpconfig.h"
 #include "libgimpwidgets/gimpwidgets.h"
 
@@ -123,7 +124,8 @@ static void     gimp_fg_bg_editor_draw_color_frame  (GimpFgBgEditor   *editor,
                                                      gint              width,
                                                      gint              height,
                                                      gint              corner_dx,
-                                                     gint              corner_dy);
+                                                     gint              corner_dy,
+                                                     gboolean          is_active_color);
 
 G_DEFINE_TYPE (GimpFgBgEditor, gimp_fg_bg_editor, GTK_TYPE_EVENT_BOX)
 
@@ -463,24 +465,33 @@ gimp_fg_bg_editor_draw (GtkWidget *widget,
   if (editor->context)
     {
       GeglColor *color;
+      gboolean   is_active_color;
+
+      is_active_color =
+        (editor->active_color == GIMP_ACTIVE_COLOR_FOREGROUND);
+
+      rect.width  -= 4;
+      rect.height -= 4;
 
       /*  draw the background frame  */
       color = gimp_context_get_background (editor->context);
-      rect.x = width  - rect.width  - border.right;
-      rect.y = height - rect.height - border.bottom;
+      rect.x = width  - rect.width  - border.right - 2;
+      rect.y = height - rect.height - border.bottom - 2;
       gimp_fg_bg_editor_draw_color_frame (editor, cr, color,
                                           rect.x,     rect.y,
                                           rect.width, rect.height,
-                                          -1,         -1);
+                                          -1,         -1,
+                                          ! is_active_color);
 
       /*  draw the foreground frame  */
       color = gimp_context_get_foreground (editor->context);
-      rect.x = border.left;
-      rect.y = border.top;
+      rect.x = border.left + 2;
+      rect.y = border.top + 2;
       gimp_fg_bg_editor_draw_color_frame (editor, cr, color,
                                           rect.x,     rect.y,
                                           rect.width, rect.height,
-                                          +1,         +1);
+                                          +1,         +1,
+                                          is_active_color);
     }
 
   gtk_style_context_restore (style);
@@ -864,7 +875,8 @@ gimp_fg_bg_editor_draw_color_frame (GimpFgBgEditor *editor,
                                     gint            width,
                                     gint            height,
                                     gint            corner_dx,
-                                    gint            corner_dy)
+                                    gint            corner_dy,
+                                    gboolean        is_active_color)
 {
   GimpPalette       *colormap_palette = NULL;
   GimpImageBaseType  base_type        = GIMP_RGB;
@@ -926,15 +938,18 @@ gimp_fg_bg_editor_draw_color_frame (GimpFgBgEditor *editor,
       g_object_unref (out_of_gamut_color);
     }
 
+  if (is_active_color)
+    {
+      cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+      cairo_rectangle (cr, x - 1, y - 1, width + 2, height + 2);
+      cairo_stroke (cr);
+    }
+
   cairo_set_line_width (cr, 1.0);
 
   cairo_set_source_rgb (cr, 0.0, 0.0, 0.0);
   cairo_rectangle (cr, x + 0.5, y + 0.5, width - 1.0, height - 1.0);
   cairo_stroke (cr);
 
-  cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-  cairo_rectangle (cr, x + 1.5, y + 1.5, width - 3.0, height - 3.0);
-  cairo_stroke (cr);
-
   cairo_restore (cr);
 }