Add GtkColorChoiceButton

This is a new color button implementation
built around GtkColorChoice.
This commit is contained in:
Matthias Clasen
2022-10-23 17:17:24 -04:00
parent 4022786847
commit aa5041e65c
4 changed files with 430 additions and 0 deletions

View File

@@ -80,6 +80,7 @@
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkcolorbutton.h>
#include <gtk/gtkcolorchoice.h>
#include <gtk/gtkcolorchoicebutton.h>
#include <gtk/gtkcolorchooser.h>
#include <gtk/gtkcolorchooserdialog.h>
#include <gtk/gtkcolorchooserwidget.h>

376
gtk/gtkcolorchoicebutton.c Normal file
View File

@@ -0,0 +1,376 @@
/*
* GTK - The GIMP Toolkit
* Copyright (C) 2022 Red Hat, Inc.
* All rights reserved.
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include "gtkcolorchoicebutton.h"
#include "gtkbinlayout.h"
#include "gtkbutton.h"
#include "gtkcolorswatchprivate.h"
#include "gtkdragsource.h"
#include "gtkdroptarget.h"
#include <glib/gi18n-lib.h>
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkprivate.h"
#include "gtksnapshot.h"
#include "gtkwidgetprivate.h"
static void set_color (GtkColorChoiceButton *self,
GdkRGBA *color);
static gboolean drop (GtkDropTarget *dest,
const GValue *value,
double x,
double y,
GtkColorChoiceButton *self);
static GdkContentProvider *
drag_prepare (GtkDragSource *source,
double x,
double y,
GtkColorChoiceButton *self);
static void button_clicked (GtkColorChoiceButton *self);
/* {{{ GObject implementation */
struct _GtkColorChoiceButton
{
GtkWidget parent_instance;
GtkWidget *button;
GtkWidget *swatch;
GtkColorChoice *choice;
};
/* Properties */
enum
{
PROP_CHOICE = 1,
PROP_COLOR,
NUM_PROPERTIES
};
static GParamSpec *properties[NUM_PROPERTIES];
G_DEFINE_TYPE (GtkColorChoiceButton, gtk_color_choice_button, GTK_TYPE_WIDGET)
static void
gtk_color_choice_button_init (GtkColorChoiceButton *self)
{
PangoLayout *layout;
PangoRectangle rect;
GtkDragSource *source;
GtkDropTarget *dest;
self->button = gtk_button_new ();
g_signal_connect_swapped (self->button, "clicked", G_CALLBACK (button_clicked), self);
gtk_widget_set_parent (self->button, GTK_WIDGET (self));
self->swatch = g_object_new (GTK_TYPE_COLOR_SWATCH,
"accessible-role", GTK_ACCESSIBLE_ROLE_IMG,
"selectable", FALSE,
"has-menu", FALSE,
"can-drag", FALSE,
NULL);
gtk_widget_set_can_focus (self->swatch, FALSE);
gtk_widget_remove_css_class (self->swatch, "activatable");
layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "Black");
pango_layout_get_pixel_extents (layout, NULL, &rect);
g_object_unref (layout);
gtk_widget_set_size_request (self->swatch, rect.width, rect.height);
gtk_button_set_child (GTK_BUTTON (self->button), self->swatch);
dest = gtk_drop_target_new (GDK_TYPE_RGBA, GDK_ACTION_COPY);
g_signal_connect (dest, "drop", G_CALLBACK (drop), self);
gtk_widget_add_controller (GTK_WIDGET (self->button), GTK_EVENT_CONTROLLER (dest));
source = gtk_drag_source_new ();
g_signal_connect (source, "prepare", G_CALLBACK (drag_prepare), self);
gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (source),
GTK_PHASE_CAPTURE);
gtk_widget_add_controller (self->button, GTK_EVENT_CONTROLLER (source));
gtk_widget_add_css_class (self->button, "color");
}
static void
gtk_color_choice_button_set_property (GObject *object,
guint param_id,
const GValue *value,
GParamSpec *pspec)
{
GtkColorChoiceButton *self = GTK_COLOR_CHOICE_BUTTON (object);
switch (param_id)
{
case PROP_CHOICE:
gtk_color_choice_button_set_choice (self, g_value_get_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
}
}
static void
gtk_color_choice_button_get_property (GObject *object,
guint param_id,
GValue *value,
GParamSpec *pspec)
{
GtkColorChoiceButton *self = GTK_COLOR_CHOICE_BUTTON (object);
switch (param_id)
{
case PROP_CHOICE:
g_value_set_object (value, self->choice);
break;
case PROP_COLOR:
{
GdkRGBA color;
gtk_color_swatch_get_rgba (GTK_COLOR_SWATCH (self->swatch), &color);
g_value_set_boxed (value, &color);
}
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec);
break;
}
}
static void
gtk_color_choice_button_finalize (GObject *object)
{
GtkColorChoiceButton *self = GTK_COLOR_CHOICE_BUTTON (object);
g_clear_object (&self->choice);
G_OBJECT_CLASS (gtk_color_choice_button_parent_class)->finalize (object);
}
static void
gtk_color_choice_button_class_init (GtkColorChoiceButtonClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
object_class->get_property = gtk_color_choice_button_get_property;
object_class->set_property = gtk_color_choice_button_set_property;
object_class->finalize = gtk_color_choice_button_finalize;
widget_class->grab_focus = gtk_widget_grab_focus_child;
widget_class->focus = gtk_widget_focus_child;
properties[PROP_CHOICE] =
g_param_spec_object ("choice", NULL, NULL,
GTK_TYPE_COLOR_CHOICE,
G_PARAM_READWRITE|G_PARAM_STATIC_STRINGS|G_PARAM_EXPLICIT_NOTIFY);
properties[PROP_COLOR] =
g_param_spec_boxed ("color", NULL, NULL,
GDK_TYPE_RGBA,
G_PARAM_READABLE|G_PARAM_STATIC_STRINGS);
g_object_class_install_properties (object_class, NUM_PROPERTIES, properties);
gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
gtk_widget_class_set_css_name (widget_class, "colorbutton");
}
/* }}} */
/* {{{ Private API, callbacks */
static guint
scale_round (double value,
double scale)
{
value = floor (value * scale + 0.5);
value = CLAMP (value, 0, scale);
return (guint)value;
}
static char *
accessible_color_name (const GdkRGBA *color)
{
if (color->alpha < 1.0)
return g_strdup_printf (_("Red %d%%, Green %d%%, Blue %d%%, Alpha %d%%"),
scale_round (color->red, 100),
scale_round (color->green, 100),
scale_round (color->blue, 100),
scale_round (color->alpha, 100));
else
return g_strdup_printf (_("Red %d%%, Green %d%%, Blue %d%%"),
scale_round (color->red, 100),
scale_round (color->green, 100),
scale_round (color->blue, 100));
}
static void
set_color (GtkColorChoiceButton *self,
GdkRGBA *color)
{
char *text;
gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (self->swatch), color);
gtk_color_choice_set_color (self->choice, color);
text = accessible_color_name (color);
gtk_accessible_update_property (GTK_ACCESSIBLE (self->swatch),
GTK_ACCESSIBLE_PROPERTY_LABEL, text,
-1);
g_free (text);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_COLOR]);
}
static gboolean
drop (GtkDropTarget *dest,
const GValue *value,
double x,
double y,
GtkColorChoiceButton *self)
{
GdkRGBA *color = g_value_get_boxed (value);
set_color (self, color);
return TRUE;
}
static GdkContentProvider *
drag_prepare (GtkDragSource *source,
double x,
double y,
GtkColorChoiceButton *self)
{
GdkRGBA color;
gtk_color_swatch_get_rgba (GTK_COLOR_SWATCH (self->swatch), &color);
return gdk_content_provider_new_typed (GDK_TYPE_RGBA, &color);
}
static void
color_chosen (GObject *source,
GAsyncResult *result,
gpointer data)
{
GtkColorChoiceButton *self = data;
GdkRGBA *color;
GError *error = NULL;
color = gtk_color_choice_present_finish (self->choice, result, &error);
if (color)
{
set_color (self, color);
gdk_rgba_free (color);
}
else
{
g_print ("%s\n", error->message);
g_error_free (error);
}
}
static void
button_clicked (GtkColorChoiceButton *self)
{
if (gtk_color_choice_get_parent (self->choice) == NULL)
{
GtkRoot *root = gtk_widget_get_root (GTK_WIDGET (self));
if (GTK_IS_WINDOW (root))
gtk_color_choice_set_parent (self->choice, GTK_WINDOW (root));
}
gtk_color_choice_present (self->choice, NULL, color_chosen, self);
}
/* }}} */
/* {{{ Public API */
/* {{{ Constructor */
GtkWidget *
gtk_color_choice_button_new (GtkColorChoice *choice)
{
GtkWidget *self;
g_return_val_if_fail (GTK_IS_COLOR_CHOICE (choice), NULL);
if (choice == NULL)
choice = gtk_color_choice_new ();
self = g_object_new (GTK_TYPE_COLOR_CHOICE_BUTTON,
"choice", choice,
NULL);
g_clear_object (&choice);
return self;
}
/* }}} */
/* {{{ Setters and Getters */
void
gtk_color_choice_button_set_choice (GtkColorChoiceButton *self,
GtkColorChoice *choice)
{
GdkRGBA color;
g_return_if_fail (GTK_IS_COLOR_CHOICE_BUTTON (self));
g_return_if_fail (GTK_IS_COLOR_CHOICE (choice));
if (!g_set_object (&self->choice, choice))
return;
gtk_color_choice_get_color (choice, &color);
set_color (self, &color);
g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_CHOICE]);
}
GtkColorChoice *
gtk_color_choice_button_get_choice (GtkColorChoiceButton *self)
{
g_return_val_if_fail (GTK_IS_COLOR_CHOICE_BUTTON (self), NULL);
return self->choice;
}
void
gtk_color_choice_button_get_color (GtkColorChoiceButton *self,
GdkRGBA *color)
{
g_return_if_fail (GTK_IS_COLOR_CHOICE_BUTTON (self));
g_return_if_fail (color != NULL);
gtk_color_swatch_get_rgba (GTK_COLOR_SWATCH (self->swatch), color);
}
/* }}} */
/* }}} */
/* vim:set foldmethod=marker expandtab: */

View File

@@ -0,0 +1,50 @@
/*
* GTK - The GIMP Toolkit
* Copyright (C) 2022 Red Hat, Inc.
* All rights reserved.
*
* This Library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public License as
* published by the Free Software Foundation; either version 2 of the
* License, or (at your option) any later version.
*
* This Library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
#error "Only <gtk/gtk.h> can be included directly."
#endif
#include <gtk/gtkbutton.h>
#include <gtk/gtkcolorchoice.h>
G_BEGIN_DECLS
#define GTK_TYPE_COLOR_CHOICE_BUTTON (gtk_color_choice_button_get_type ())
GDK_AVAILABLE_IN_4_10
G_DECLARE_FINAL_TYPE (GtkColorChoiceButton, gtk_color_choice_button, GTK, COLOR_CHOICE_BUTTON, GtkWidget)
GDK_AVAILABLE_IN_4_10
GtkWidget * gtk_color_choice_button_new (GtkColorChoice *choice);
GDK_AVAILABLE_IN_4_10
void gtk_color_choice_button_set_choice (GtkColorChoiceButton *self,
GtkColorChoice *choice);
GDK_AVAILABLE_IN_4_10
GtkColorChoice * gtk_color_choice_button_get_choice (GtkColorChoiceButton *self);
GDK_AVAILABLE_IN_4_10
void gtk_color_choice_button_get_color (GtkColorChoiceButton *self,
GdkRGBA *color);
G_END_DECLS

View File

@@ -184,6 +184,7 @@ gtk_public_sources = files([
'gtkcheckbutton.c',
'gtkcolorbutton.c',
'gtkcolorchoice.c',
'gtkcolorchoicebutton.c',
'gtkcolorchooser.c',
'gtkcolorchooserdialog.c',
'gtkcolorchooserwidget.c',
@@ -441,6 +442,8 @@ gtk_public_headers = files([
'gtkcenterlayout.h',
'gtkcheckbutton.h',
'gtkcolorbutton.h',
'gtkcolorchoice.h',
'gtkcolorchoicebutton.h',
'gtkcolorchooser.h',
'gtkcolorchooserdialog.h',
'gtkcolorchooserwidget.h',