[gtk+/wip/baedert/drawing: 217/355] testwidgetfocus: Drop SPACING constant in favor for CSS
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/drawing: 217/355] testwidgetfocus: Drop SPACING constant in favor for CSS
- Date: Tue, 11 Jul 2017 16:46:34 +0000 (UTC)
commit 7766b4d4059e879dcf0dd86a13a3dfa811223f96
Author: Timm Bäder <mail baedert org>
Date: Fri Jun 2 22:08:22 2017 +0200
testwidgetfocus: Drop SPACING constant in favor for CSS
This makes it easier to test various other properties of widgets.
tests/testwidgetfocus.c | 136 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 125 insertions(+), 11 deletions(-)
---
diff --git a/tests/testwidgetfocus.c b/tests/testwidgetfocus.c
index e63deb3..780f652 100644
--- a/tests/testwidgetfocus.c
+++ b/tests/testwidgetfocus.c
@@ -12,11 +12,55 @@ typedef struct _GtkFocusWidgetClass GtkFocusWidgetClass;
#define GTK_IS_FOCUS_WIDGET_CLASS(cls) (G_TYPE_CHECK_CLASS_TYPE(cls, GTK_TYPE_FOCUS_WIDGET))
#define GTK_FOCUS_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS(obj, GTK_TYPE_FOCUS_WIDGET,
GtkFocusWidgetClass))
-#define SPACING 30
+const char *css =
+"* {"
+" transition: none; "
+"}"
+"focuswidget {"
+" padding: 30px;"
+" font-size: 70%;"
+"}"
+"focuswidget button:nth-child(1) {"
+" margin-right: 15px;"
+" margin-bottom: 15px;"
+"}"
+"focuswidget button:nth-child(2) {"
+" margin-left: 15px;"
+" margin-bottom: 15px;"
+"}"
+"focuswidget button:nth-child(3) {"
+" margin-right: 15px;"
+" margin-top: 15px;"
+"}"
+"focuswidget button:nth-child(4) {"
+" margin-left: 15px;"
+" margin-top: 15px;"
+"}"
+"focuswidget button {"
+" min-width: 80px;"
+" min-height: 80px;"
+" margin: 0px;"
+" border: 5px solid green;"
+" border-radius: 0px;"
+" padding: 10px;"
+" background-image: none;"
+" background-color: white;"
+" box-shadow: none;"
+"}"
+"focuswidget button:hover {"
+" background-color: black;"
+" color: white;"
+"}"
+"focuswidget button label:hover {"
+" background-color: green;"
+"}"
+;
struct _GtkFocusWidget
{
GtkWidget parent_instance;
+ int mouse_x;
+ int mouse_y;
union {
struct {
@@ -43,26 +87,26 @@ static void
gtk_focus_widget_size_allocate (GtkWidget *widget, GtkAllocation *allocation)
{
GtkFocusWidget *self = GTK_FOCUS_WIDGET (widget);
- int child_width = (allocation->width - (3 * SPACING)) / 2;
- int child_height = (allocation->height - (3 * SPACING)) / 2;
+ int child_width = (allocation->width) / 2;
+ int child_height = (allocation->height) / 2;
GtkAllocation child_alloc;
- child_alloc.x = SPACING + allocation->x;
- child_alloc.y = SPACING + allocation->y;
+ child_alloc.x = 0;
+ child_alloc.y = 0;
child_alloc.width = child_width;
child_alloc.height = child_height;
gtk_widget_size_allocate (self->child1, &child_alloc);
- child_alloc.x += SPACING + child_width;
+ child_alloc.x += child_width;
gtk_widget_size_allocate (self->child2, &child_alloc);
- child_alloc.y += SPACING + child_height;
+ child_alloc.y += child_height;
gtk_widget_size_allocate (self->child4, &child_alloc);
- child_alloc.x -= SPACING + child_width;
+ child_alloc.x -= child_width;
gtk_widget_size_allocate (self->child3, &child_alloc);
}
@@ -94,9 +138,6 @@ gtk_focus_widget_measure (GtkWidget *widget,
*minimum *= 2;
*natural *= 2;
-
- *minimum += SPACING * 3;
- *natural += SPACING * 3;
}
static void
@@ -108,6 +149,64 @@ gtk_focus_widget_snapshot (GtkWidget *widget, GtkSnapshot *snapshot)
gtk_widget_snapshot_child (widget, self->child2, snapshot);
gtk_widget_snapshot_child (widget, self->child3, snapshot);
gtk_widget_snapshot_child (widget, self->child4, snapshot);
+
+ if (self->mouse_x != G_MININT && self->mouse_y != G_MININT)
+ {
+ PangoLayout *layout;
+ char *text;
+ GtkAllocation alloc;
+ graphene_rect_t bounds;
+ GdkRGBA black = {0, 0, 0, 1};
+
+ gtk_widget_get_allocation (widget, &alloc);
+
+ /* Since event coordinates and drawing is supposed to happen in the
+ * same coodinates space, this should all work out just fine. */
+ bounds.origin.x = self->mouse_x;
+ bounds.origin.y = -30;
+ bounds.size.width = 1;
+ bounds.size.height = alloc.height;
+ gtk_snapshot_append_color (snapshot,
+ &black,
+ &bounds,
+ "Crosshair 1");
+
+ bounds.origin.x = -30;
+ bounds.origin.y = self->mouse_y;
+ bounds.size.width = alloc.width;
+ bounds.size.height = 1;
+ gtk_snapshot_append_color (snapshot,
+ &black,
+ &bounds,
+ "Crosshair 2");
+
+ layout = gtk_widget_create_pango_layout (widget, NULL);
+ text = g_strdup_printf ("%d×%d", self->mouse_x, self->mouse_y);
+ pango_layout_set_text (layout, text, -1);
+
+ gtk_snapshot_render_layout (snapshot,
+ gtk_widget_get_style_context (widget),
+ self->mouse_x + 2,
+ self->mouse_y - 15, /* *shrug* */
+ layout);
+
+ g_free (text);
+ g_object_unref (layout);
+ }
+}
+
+static gboolean
+gtk_focus_widget_motion_notify_event (GtkWidget *widget,
+ GdkEventMotion *event)
+{
+ GtkFocusWidget *self = GTK_FOCUS_WIDGET (widget);
+
+ self->mouse_x = event->x;
+ self->mouse_y = event->y;
+
+ gtk_widget_queue_draw (widget);
+
+ return GDK_EVENT_PROPAGATE;
}
static void
@@ -136,6 +235,9 @@ gtk_focus_widget_init (GtkFocusWidget *self)
gtk_widget_set_parent (self->child3, GTK_WIDGET (self));
self->child4 = gtk_button_new_with_label ("4");
gtk_widget_set_parent (self->child4, GTK_WIDGET (self));
+
+ self->mouse_x = G_MININT;
+ self->mouse_y = G_MININT;
}
static void
@@ -149,6 +251,9 @@ gtk_focus_widget_class_init (GtkFocusWidgetClass *klass)
widget_class->snapshot = gtk_focus_widget_snapshot;
widget_class->measure = gtk_focus_widget_measure;
widget_class->size_allocate = gtk_focus_widget_size_allocate;
+ widget_class->motion_notify_event = gtk_focus_widget_motion_notify_event;
+
+ gtk_widget_class_set_css_name (widget_class, "focuswidget");
}
int
@@ -156,12 +261,21 @@ main()
{
GtkWidget *window;
GtkWidget *widget;
+ GtkCssProvider *provider;
+
gtk_init ();
+ provider = gtk_css_provider_new ();
+ gtk_css_provider_load_from_data (provider, css, -1);
+ gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
+ GTK_STYLE_PROVIDER (provider),
+ GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
widget = g_object_new (GTK_TYPE_FOCUS_WIDGET, NULL);
+ gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
+
gtk_container_add (GTK_CONTAINER (window), widget);
g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]