* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*
* Author:
* Emmanuele Bassi <ebassi@linux.intel.com>
#include "gtkswitch.h"
-#include "gtkaccessibleprivate.h"
#include "gtkactivatable.h"
#include "gtkintl.h"
-#include "gtkstyle.h"
#include "gtkprivate.h"
#include "gtktoggleaction.h"
#include "gtkwidget.h"
#include "gtkmarshalers.h"
+#include "gtkapplicationprivate.h"
+#include "gtkactionable.h"
+#include "a11y/gtkswitchaccessible.h"
+#include "gtkactionhelper.h"
+#include <math.h>
#define DEFAULT_SLIDER_WIDTH (36)
#define DEFAULT_SLIDER_HEIGHT (22)
{
GdkWindow *event_window;
GtkAction *action;
+ GtkActionHelper *action_helper;
gint handle_x;
gint offset;
PROP_ACTIVE,
PROP_RELATED_ACTION,
PROP_USE_ACTION_APPEARANCE,
- LAST_PROP
+ LAST_PROP,
+ PROP_ACTION_NAME,
+ PROP_ACTION_TARGET
};
enum
static GParamSpec *switch_props[LAST_PROP] = { NULL, };
-static GType gtk_switch_accessible_factory_get_type (void);
-
+static void gtk_switch_actionable_iface_init (GtkActionableInterface *iface);
static void gtk_switch_activatable_interface_init (GtkActivatableIface *iface);
G_DEFINE_TYPE_WITH_CODE (GtkSwitch, gtk_switch, GTK_TYPE_WIDGET,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIONABLE,
+ gtk_switch_actionable_iface_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_ACTIVATABLE,
gtk_switch_activatable_interface_init));
if (event->x <= allocation.width / 2)
{
priv->in_press = TRUE;
- return FALSE;
+ return TRUE;
}
priv->offset = event->x - allocation.width / 2;
if (event->x >= allocation.width / 2)
{
priv->in_press = TRUE;
- return FALSE;
+ return TRUE;
}
priv->offset = event->x;
"gtk-dnd-drag-threshold", &priv->drag_threshold,
NULL);
- return FALSE;
+ return TRUE;
}
static gboolean
GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding;
+ gint width, focus_width, focus_pad;
+
+ gtk_widget_style_get (widget,
+ "focus-line-width", &focus_width,
+ "focus-padding", &focus_pad,
+ NULL);
context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
+
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_style_context_get_padding (context, state, &padding);
+ gtk_style_context_restore (context);
+
gtk_widget_get_allocation (widget, &allocation);
+ width = allocation.width - 2 * (focus_width + focus_pad);
+
/* constrain the handle within the trough width */
- if (position > (allocation.width / 2 - padding.right))
- priv->handle_x = allocation.width / 2 - padding.right;
+ if (position > (width / 2) - padding.right)
+ priv->handle_x = width / 2 - padding.right;
else if (position < padding.left)
- priv->handle_x = padding.left;
+ priv->handle_x = 0;
else
priv->handle_x = position;
gint *minimum,
gint *natural)
{
- GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding;
PangoRectangle logical_rect;
context = gtk_widget_get_style_context (widget);
- state = gtk_widget_get_state_flags (widget);
-
- if (priv->is_active)
- state |= GTK_STATE_FLAG_ACTIVE;
+ state = gtk_style_context_get_state (context);
gtk_style_context_save (context);
- gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_style_context_get_padding (context, state, &padding);
gint *minimum,
gint *natural)
{
- GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
GtkStyleContext *context;
GtkStateFlags state;
GtkBorder padding;
gchar *str;
context = gtk_widget_get_style_context (widget);
- state = gtk_widget_get_state_flags (widget);
-
- if (priv->is_active)
- state |= GTK_STATE_FLAG_ACTIVE;
+ state = gtk_style_context_get_state (context);
gtk_style_context_save (context);
- gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_style_context_get_padding (context, state, &padding);
cairo_t *cr,
GdkRectangle *box)
{
- GtkSwitchPrivate *priv = GTK_SWITCH (widget)->priv;
GtkStyleContext *context = gtk_widget_get_style_context (widget);
- GtkStateFlags state;
-
- state = gtk_widget_get_state_flags (widget);
-
- if (priv->is_active)
- state |= GTK_STATE_FLAG_ACTIVE;
gtk_style_context_save (context);
- gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_render_slider (context, cr,
GtkStyleContext *context;
GdkRectangle handle;
PangoLayout *layout;
+ PangoFontDescription *desc;
+ const PangoFontDescription *style_desc;
PangoRectangle rect;
gint label_x, label_y;
- GtkStateFlags state;
GtkBorder padding;
+ GtkStateFlags state;
gint focus_width, focus_pad;
gint x, y, width, height;
+ gint font_size, style_font_size;
gtk_widget_style_get (widget,
"focus-line-width", &focus_width,
context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
- if (priv->is_active)
- state |= GTK_STATE_FLAG_ACTIVE;
-
gtk_style_context_save (context);
- gtk_style_context_set_state (context, state);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SLIDER);
gtk_style_context_get_padding (context, state, &padding);
width = gtk_widget_get_allocated_width (widget);
height = gtk_widget_get_allocated_height (widget);
- if (gtk_widget_has_focus (widget))
+ if (gtk_widget_has_visible_focus (widget))
gtk_render_focus (context, cr, x, y, width, height);
x += focus_width + focus_pad;
gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_TROUGH);
- gtk_style_context_set_state (context, state);
gtk_render_background (context, cr, x, y, width, height);
gtk_render_frame (context, cr, x, y, width, height);
* the state
*/
layout = gtk_widget_create_pango_layout (widget, C_("switch", "ON"));
+
+ /* FIXME: this should be really done in the theme, but overriding font size
+ * from it doesn't currently work. So we have to hardcode this here and
+ * below for the "OFF" label.
+ */
+ desc = pango_font_description_new ();
+
+ style_desc = gtk_style_context_get_font (context, state);
+ style_font_size = pango_font_description_get_size (style_desc);
+ font_size = MAX (style_font_size - 1 * PANGO_SCALE, ceil (style_font_size * PANGO_SCALE_SMALL));
+
+ pango_font_description_set_size (desc, font_size);
+
+ pango_layout_set_font_description (layout, desc);
+
pango_layout_get_extents (layout, NULL, &rect);
pango_extents_to_pixels (&rect, NULL);
* glyphs then use WHITE CIRCLE (U+25CB) as the text for the state
*/
layout = gtk_widget_create_pango_layout (widget, C_("switch", "OFF"));
+ pango_layout_set_font_description (layout, desc);
+
pango_layout_get_extents (layout, NULL, &rect);
pango_extents_to_pixels (&rect, NULL);
gtk_switch_paint_handle (widget, cr, &handle);
- return FALSE;
-}
-
-static AtkObject *
-gtk_switch_get_accessible (GtkWidget *widget)
-{
- static gboolean first_time = TRUE;
+ pango_font_description_free (desc);
- if (G_UNLIKELY (first_time))
- {
- _gtk_accessible_set_factory_type (GTK_TYPE_SWITCH,
- gtk_switch_accessible_factory_get_type ());
- first_time = FALSE;
- }
-
- return GTK_WIDGET_CLASS (gtk_switch_parent_class)->get_accessible (widget);
+ return FALSE;
}
static void
}
}
+static void
+gtk_switch_set_action_name (GtkActionable *actionable,
+ const gchar *action_name)
+{
+ GtkSwitch *sw = GTK_SWITCH (actionable);
+
+ if (!sw->priv->action_helper)
+ sw->priv->action_helper = gtk_action_helper_new (actionable);
+
+ gtk_action_helper_set_action_name (sw->priv->action_helper, action_name);
+}
+
+static void
+gtk_switch_set_action_target_value (GtkActionable *actionable,
+ GVariant *action_target)
+{
+ GtkSwitch *sw = GTK_SWITCH (actionable);
+
+ if (!sw->priv->action_helper)
+ sw->priv->action_helper = gtk_action_helper_new (actionable);
+
+ gtk_action_helper_set_action_target_value (sw->priv->action_helper, action_target);
+}
+
+static const gchar *
+gtk_switch_get_action_name (GtkActionable *actionable)
+{
+ GtkSwitch *sw = GTK_SWITCH (actionable);
+
+ return gtk_action_helper_get_action_name (sw->priv->action_helper);
+}
+
+static GVariant *
+gtk_switch_get_action_target_value (GtkActionable *actionable)
+{
+ GtkSwitch *sw = GTK_SWITCH (actionable);
+
+ return gtk_action_helper_get_action_target_value (sw->priv->action_helper);
+}
+
+static void
+gtk_switch_actionable_iface_init (GtkActionableInterface *iface)
+{
+ iface->get_action_name = gtk_switch_get_action_name;
+ iface->set_action_name = gtk_switch_set_action_name;
+ iface->get_action_target_value = gtk_switch_get_action_target_value;
+ iface->set_action_target_value = gtk_switch_set_action_target_value;
+}
+
static void
gtk_switch_set_property (GObject *gobject,
guint prop_id,
gtk_switch_set_use_action_appearance (sw, g_value_get_boolean (value));
break;
+ case PROP_ACTION_NAME:
+ gtk_switch_set_action_name (GTK_ACTIONABLE (sw), g_value_get_string (value));
+ break;
+
+ case PROP_ACTION_TARGET:
+ gtk_switch_set_action_target_value (GTK_ACTIONABLE (sw), g_value_get_variant (value));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
}
g_value_set_boolean (value, priv->use_action_appearance);
break;
+ case PROP_ACTION_NAME:
+ g_value_set_string (value, gtk_action_helper_get_action_name (priv->action_helper));
+ break;
+
+ case PROP_ACTION_TARGET:
+ g_value_set_variant (value, gtk_action_helper_get_action_target_value (priv->action_helper));
+ break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
}
{
GtkSwitchPrivate *priv = GTK_SWITCH (object)->priv;
+ g_clear_object (&priv->action_helper);
+
if (priv->action)
{
gtk_activatable_do_set_related_action (GTK_ACTIVATABLE (object), NULL);
widget_class->motion_notify_event = gtk_switch_motion;
widget_class->enter_notify_event = gtk_switch_enter;
widget_class->leave_notify_event = gtk_switch_leave;
- widget_class->get_accessible = gtk_switch_get_accessible;
klass->activate = gtk_switch_activate;
G_TYPE_NONE, 0);
widget_class->activate_signal = signals[ACTIVATE];
+ g_object_class_override_property (gobject_class, PROP_ACTION_NAME, "action-name");
+ g_object_class_override_property (gobject_class, PROP_ACTION_TARGET, "action-target");
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SWITCH_ACCESSIBLE);
}
static void
if (priv->is_active != is_active)
{
AtkObject *accessible;
- GtkWidget *widget;
- GtkStyleContext *context;
- widget = GTK_WIDGET (sw);
priv->is_active = is_active;
g_object_notify_by_pspec (G_OBJECT (sw), switch_props[PROP_ACTIVE]);
+ if (priv->action_helper)
+ gtk_action_helper_activate (priv->action_helper);
+
if (priv->action)
gtk_action_activate (priv->action);
accessible = gtk_widget_get_accessible (GTK_WIDGET (sw));
atk_object_notify_state_change (accessible, ATK_STATE_CHECKED, priv->is_active);
- if (gtk_widget_get_realized (widget))
- {
- context = gtk_widget_get_style_context (widget);
- gtk_style_context_notify_state_change (context,
- gtk_widget_get_window (widget),
- NULL, GTK_STATE_ACTIVE, is_active);
- }
+ if (priv->is_active)
+ gtk_widget_set_state_flags (GTK_WIDGET (sw), GTK_STATE_FLAG_ACTIVE, FALSE);
+ else
+ gtk_widget_unset_state_flags (GTK_WIDGET (sw), GTK_STATE_FLAG_ACTIVE);
gtk_widget_queue_draw (GTK_WIDGET (sw));
}
iface->update = gtk_switch_update;
iface->sync_action_properties = gtk_switch_sync_action_properties;
}
-
-/* accessibility: object */
-
-typedef struct _GtkSwitchAccessible GtkSwitchAccessible;
-typedef struct _GtkSwitchAccessibleClass GtkSwitchAccessibleClass;
-
-struct _GtkSwitchAccessible
-{
- GtkAccessible object;
-
- gchar *description;
- guint action_idle;
-};
-
-static void atk_action_interface_init (AtkActionIface *iface);
-
-ATK_DEFINE_TYPE_WITH_CODE (GtkSwitchAccessible, _gtk_switch_accessible, GTK_TYPE_SWITCH,
- G_IMPLEMENT_INTERFACE (ATK_TYPE_ACTION, atk_action_interface_init))
-
-static AtkStateSet *
-gtk_switch_accessible_ref_state_set (AtkObject *accessible)
-{
- AtkStateSet *state_set;
- GtkWidget *widget;
-
- state_set = ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->ref_state_set (accessible);
-
- widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
- if (widget == NULL)
- return state_set;
-
- if (gtk_switch_get_active (GTK_SWITCH (widget)))
- atk_state_set_add_state (state_set, ATK_STATE_CHECKED);
-
- return state_set;
-}
-
-static void
-gtk_switch_accessible_finalize (GObject *obj)
-{
- GtkSwitchAccessible *accessible = (GtkSwitchAccessible *)obj;
-
- g_free (accessible->description);
-
- if (accessible->action_idle)
- g_source_remove (accessible->action_idle);
-
- G_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->finalize (obj);
-}
-
-static void
-_gtk_switch_accessible_initialize (AtkObject *accessible,
- gpointer widget)
-{
- ATK_OBJECT_CLASS (_gtk_switch_accessible_parent_class)->initialize (accessible, widget);
-
- atk_object_set_role (accessible, ATK_ROLE_TOGGLE_BUTTON);
- atk_object_set_name (accessible, C_("light switch widget", "Switch"));
- atk_object_set_description (accessible, _("Switches between on and off states"));
-}
-
-static void
-_gtk_switch_accessible_class_init (GtkSwitchAccessibleClass *klass)
-{
- GObjectClass *object_class = G_OBJECT_CLASS (klass);
- AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
-
- object_class->finalize = gtk_switch_accessible_finalize;
-
- atk_class->initialize = _gtk_switch_accessible_initialize;
- atk_class->ref_state_set = gtk_switch_accessible_ref_state_set;
-}
-
-static void
-_gtk_switch_accessible_init (GtkSwitchAccessible *self)
-{
- self->description = NULL;
- self->action_idle = 0;
-}
-
-/* accessibility: action interface */
-
-static gint
-gtk_switch_action_get_n_actions (AtkAction *action)
-{
- return 1;
-}
-
-static const gchar *
-gtk_switch_action_get_name (AtkAction *action,
- gint i)
-{
- return "toggle";
-}
-
-static const gchar *
-gtk_switch_action_get_description (AtkAction *action,
- gint i)
-{
- GtkSwitchAccessible *accessible = (GtkSwitchAccessible*)action;
-
- return accessible->description;
-}
-
-static gboolean
-gtk_switch_action_set_description (AtkAction *action,
- gint i,
- const gchar *description)
-{
- GtkSwitchAccessible *accessible = (GtkSwitchAccessible*)action;
-
- g_free (accessible->description);
- accessible->description = g_strdup (description);
-
- return TRUE;
-}
-
-static gboolean
-idle_do_action (gpointer data)
-{
- GtkSwitchAccessible *accessible = data;
- GtkWidget *widget;
- GtkSwitch *sw;
-
- widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (data));
- sw = GTK_SWITCH (widget);
-
- accessible->action_idle = 0;
-
- if (widget == NULL ||
- !gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
- return FALSE;
-
- gtk_switch_set_active (sw, !gtk_switch_get_active (sw));
-
- return FALSE;
-}
-
-static gboolean
-gtk_switch_action_do_action (AtkAction *action,
- gint i)
-{
- GtkSwitchAccessible *accessible;
- GtkWidget *widget;
-
- widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (action));
- if (widget == NULL)
- return FALSE;
-
- if (!gtk_widget_is_sensitive (widget) || !gtk_widget_get_visible (widget))
- return FALSE;
-
- accessible = (GtkSwitchAccessible *)action;
-
- if (!accessible->action_idle)
- accessible->action_idle = gdk_threads_add_idle (idle_do_action, accessible);
-
- return TRUE;
-}
-
-static void
-atk_action_interface_init (AtkActionIface *iface)
-{
- iface->do_action = gtk_switch_action_do_action;
- iface->get_n_actions = gtk_switch_action_get_n_actions;
- iface->get_name = gtk_switch_action_get_name;
- iface->get_description = gtk_switch_action_get_description;
- iface->set_description = gtk_switch_action_set_description;
-}
-
-/* accessibility: factory */
-
-typedef AtkObjectFactoryClass GtkSwitchAccessibleFactoryClass;
-typedef AtkObjectFactory GtkSwitchAccessibleFactory;
-
-G_DEFINE_TYPE (GtkSwitchAccessibleFactory,
- gtk_switch_accessible_factory,
- ATK_TYPE_OBJECT_FACTORY);
-
-static GType
-gtk_switch_accessible_factory_get_accessible_type (void)
-{
- return _gtk_switch_accessible_get_type ();
-}
-
-static AtkObject *
-gtk_switch_accessible_factory_create_accessible (GObject *obj)
-{
- AtkObject *accessible;
-
- accessible = g_object_new (_gtk_switch_accessible_get_type (), NULL);
- atk_object_initialize (accessible, obj);
-
- return accessible;
-}
-
-static void
-gtk_switch_accessible_factory_class_init (AtkObjectFactoryClass *klass)
-{
- klass->create_accessible = gtk_switch_accessible_factory_create_accessible;
- klass->get_accessible_type = gtk_switch_accessible_factory_get_accessible_type;
-}
-
-static void
-gtk_switch_accessible_factory_init (AtkObjectFactory *factory)
-{
-}