constraint solver: Fix repeat suggestions

We were not storing the previous value, causing
the first two suggestions to work, but not later
ones.

Fixes the test added in the previous commit.

demos/constraint-editor/constraint-editor-application.c

@@ -1,94 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "config.h"
-
-#include "constraint-editor-application.h"
-#include "constraint-editor-window.h"
-
-struct _ConstraintEditorApplication
-{
-  GtkApplication parent_instance;
-};
-
-G_DEFINE_TYPE(ConstraintEditorApplication, constraint_editor_application, GTK_TYPE_APPLICATION);
-
-static void
-constraint_editor_application_init (ConstraintEditorApplication *app)
-{
-}
-
-static void
-quit_activated (GSimpleAction *action,
-                GVariant      *parameter,
-                gpointer       data)
-{
-  g_application_quit (G_APPLICATION (data));
-}
-
-static GActionEntry app_entries[] =
-{
-  { "quit", quit_activated, NULL, NULL, NULL }
-};
-
-static void
-constraint_editor_application_startup (GApplication *app)
-{
-  const char *quit_accels[2] = { "<Ctrl>Q", NULL };
-  GtkCssProvider *provider;
-
-  G_APPLICATION_CLASS (constraint_editor_application_parent_class)->startup (app);
-
-  g_action_map_add_action_entries (G_ACTION_MAP (app),
-                                   app_entries, G_N_ELEMENTS (app_entries),
-                                   app);
-  gtk_application_set_accels_for_action (GTK_APPLICATION (app), "app.quit", quit_accels);
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/org/gtk/gtk4/constraint-editor/constraint-editor.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-}
-
-static void
-constraint_editor_application_activate (GApplication *app)
-{
-  ConstraintEditorWindow *win;
-
-  win = constraint_editor_window_new (CONSTRAINT_EDITOR_APPLICATION (app));
-  gtk_window_present (GTK_WINDOW (win));
-}
-
-static void
-constraint_editor_application_class_init (ConstraintEditorApplicationClass *class)
-{
-  GApplicationClass *application_class = G_APPLICATION_CLASS (class);
-
-  application_class->startup = constraint_editor_application_startup;
-  application_class->activate = constraint_editor_application_activate;
-}
-
-ConstraintEditorApplication *
-constraint_editor_application_new (void)
-{
-  return g_object_new (CONSTRAINT_EDITOR_APPLICATION_TYPE,
-                       "application-id", "org.gtk.gtk4.ConstraintEditor",
-                       NULL);
-}

demos/constraint-editor/constraint-editor-application.h

@@ -1,28 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define CONSTRAINT_EDITOR_APPLICATION_TYPE (constraint_editor_application_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintEditorApplication, constraint_editor_application, CONSTRAINT, EDITOR_APPLICATION, GtkApplication)
-
-ConstraintEditorApplication *constraint_editor_application_new (void);

demos/constraint-editor/constraint-editor-window.c

@@ -1,354 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "config.h"
-
-#include "constraint-editor-window.h"
-#include "constraint-view.h"
-#include "constraint-editor.h"
-#include "guide-editor.h"
-
-struct _ConstraintEditorWindow
-{
-  GtkApplicationWindow parent_instance;
-
-  GtkWidget *paned;
-  GtkWidget *view;
-  GtkWidget *list;
-};
-
-G_DEFINE_TYPE(ConstraintEditorWindow, constraint_editor_window, GTK_TYPE_APPLICATION_WINDOW);
-
-gboolean
-constraint_editor_window_load (ConstraintEditorWindow *self,
-                               GFile            *file)
-{
-  GBytes *bytes;
-
-  bytes = g_file_load_bytes (file, NULL, NULL, NULL);
-  if (bytes == NULL)
-    return FALSE;
-
-  if (!g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
-    {
-      g_bytes_unref (bytes);
-      return FALSE;
-    }
-
-#if 0
-
-  gtk_text_buffer_get_end_iter (self->text_buffer, &end);
-  gtk_text_buffer_insert (self->text_buffer,
-                          &end,
-                          g_bytes_get_data (bytes, NULL),
-                          g_bytes_get_size (bytes));
-#endif
-
-  g_bytes_unref (bytes);
-
-  return TRUE;
-}
-
-static void
-constraint_editor_window_finalize (GObject *object)
-{
-  //ConstraintEditorWindow *self = (ConstraintEditorWindow *)object;
-
-  G_OBJECT_CLASS (constraint_editor_window_parent_class)->finalize (object);
-}
-
-static int child_counter;
-static int guide_counter;
-
-static void
-add_child (ConstraintEditorWindow *win)
-{
-  char *name;
-
-  child_counter++;
-  name = g_strdup_printf ("Child %d", child_counter);
-  constraint_view_add_child (CONSTRAINT_VIEW (win->view), name);
-  g_free (name);
-}
-
-static void
-add_guide (ConstraintEditorWindow *win)
-{
-  char *name;
-  GtkConstraintGuide *guide;
-
-  guide_counter++;
-  name = g_strdup_printf ("Guide %d", guide_counter);
-  guide = g_object_new (GTK_TYPE_CONSTRAINT_GUIDE, NULL);
-  g_object_set_data_full (G_OBJECT (guide), "name", name, g_free);
-
-  constraint_view_add_guide (CONSTRAINT_VIEW (win->view), guide);
-}
-
-static void
-constraint_editor_done (ConstraintEditor *editor,
-                        GtkConstraint    *constraint,
-                        ConstraintEditorWindow *win)
-{
-  GtkConstraint *old_constraint;
-
-  g_object_get (editor, "constraint", &old_constraint, NULL);
-
-  if (old_constraint)
-    constraint_view_remove_constraint (CONSTRAINT_VIEW (win->view), old_constraint);
-
-  constraint_view_add_constraint (CONSTRAINT_VIEW (win->view), constraint);
-
-  g_clear_object (&old_constraint);
-
-  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
-}
-
-static void
-edit_constraint (ConstraintEditorWindow *win,
-                 GtkConstraint          *constraint)
-{
-  GtkWidget *window;
-  ConstraintEditor *editor;
-  GListModel *model;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
-  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-  if (constraint)
-    gtk_window_set_title (GTK_WINDOW (window), "Edit Constraint");
-  else
-    gtk_window_set_title (GTK_WINDOW (window), "Create Constraint");
-
-  model = constraint_view_get_model (CONSTRAINT_VIEW (win->view));
-
-  editor = constraint_editor_new (model, constraint);
-
-  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
-
-  g_signal_connect (editor, "done", G_CALLBACK (constraint_editor_done), win);
-
-  gtk_widget_show (window);
-}
-
-static void
-add_constraint (ConstraintEditorWindow *win)
-{
-  edit_constraint (win, NULL);
-}
-
-static void
-guide_editor_done (GuideEditor            *editor,
-                   GtkConstraintGuide     *guide,
-                   ConstraintEditorWindow *win)
-{
-  constraint_view_guide_changed (CONSTRAINT_VIEW (win->view), guide);
-  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
-}
-
-static void
-edit_guide (ConstraintEditorWindow *win,
-            GtkConstraintGuide     *guide)
-{
-  GtkWidget *window;
-  GuideEditor *editor;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-  gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
-  gtk_window_set_title (GTK_WINDOW (window), "Edit Guide");
-
-  editor = guide_editor_new (guide);
-  gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (editor));
-
-  g_signal_connect (editor, "done", G_CALLBACK (guide_editor_done), win);
-  gtk_widget_show (window);
-}
-
-static void
-row_activated (GtkListBox *list,
-               GtkListBoxRow *row,
-               ConstraintEditorWindow *win)
-{
-  GObject *item;
-
-  item = G_OBJECT (g_object_get_data (G_OBJECT (row), "item"));
-
-  if (GTK_IS_CONSTRAINT (item))
-    edit_constraint (win, GTK_CONSTRAINT (item));
-  else if (GTK_IS_CONSTRAINT_GUIDE (item))
-    edit_guide (win, GTK_CONSTRAINT_GUIDE (item));
-}
-
-static void
-constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  g_type_ensure (CONSTRAINT_VIEW_TYPE);
-
-  object_class->finalize = constraint_editor_window_finalize;
-
-  gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/org/gtk/gtk4/constraint-editor/constraint-editor-window.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditorWindow, paned);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditorWindow, view);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditorWindow, list);
-
-  gtk_widget_class_bind_template_callback (widget_class, add_child);
-  gtk_widget_class_bind_template_callback (widget_class, add_guide);
-  gtk_widget_class_bind_template_callback (widget_class, add_constraint);
-  gtk_widget_class_bind_template_callback (widget_class, row_activated);
-}
-
-static void
-row_edit (GtkButton *button,
-          ConstraintEditorWindow *win)
-{
-  GtkWidget *row;
-  GObject *item;
-
-  row = gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_LIST_BOX_ROW);
-  item = (GObject *)g_object_get_data (G_OBJECT (row), "item");
-  if (GTK_IS_CONSTRAINT (item))
-    edit_constraint (win, GTK_CONSTRAINT (item));
-  else if (GTK_IS_CONSTRAINT_GUIDE (item))
-    edit_guide (win, GTK_CONSTRAINT_GUIDE (item));
-}
-
-static void
-mark_constraints_invalid (ConstraintEditorWindow *win,
-                          gpointer                removed)
-{
-  GtkWidget *child;
-  GObject *item;
-
-  for (child = gtk_widget_get_first_child (win->list);
-       child;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      item = (GObject *)g_object_get_data (G_OBJECT (child), "item");
-      if (GTK_IS_CONSTRAINT (item))
-        {
-          GtkConstraint *constraint = GTK_CONSTRAINT (item);
-
-          if (gtk_constraint_get_target (constraint) == (GtkConstraintTarget *)removed ||
-              gtk_constraint_get_source (constraint) == (GtkConstraintTarget *)removed)
-            {
-              GtkWidget *button;
-              button = (GtkWidget *)g_object_get_data (G_OBJECT (child), "edit");
-              gtk_button_set_icon_name (GTK_BUTTON (button), "dialog-warning-symbolic");
-              gtk_widget_set_tooltip_text (button, "Constraint is invalid");
-            }
-        }
-    }
-}
-
-static void
-row_delete (GtkButton *button,
-            ConstraintEditorWindow *win)
-{
-  GtkWidget *row;
-  GObject *item;
-
-  row = gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_LIST_BOX_ROW);
-  item = (GObject *)g_object_get_data (G_OBJECT (row), "item");
-  if (GTK_IS_CONSTRAINT (item))
-    constraint_view_remove_constraint (CONSTRAINT_VIEW (win->view),
-                                       GTK_CONSTRAINT (item));
-  else if (GTK_IS_CONSTRAINT_GUIDE (item))
-    {
-      mark_constraints_invalid (win, item);
-      constraint_view_remove_guide (CONSTRAINT_VIEW (win->view),
-                                    GTK_CONSTRAINT_GUIDE (item));
-    }
-  else if (GTK_IS_WIDGET (item))
-    {
-      mark_constraints_invalid (win, item);
-      constraint_view_remove_child (CONSTRAINT_VIEW (win->view),
-                                    GTK_WIDGET (item));
-    }
-}
-
-static GtkWidget *
-create_widget_func (gpointer item,
-                    gpointer user_data)
-{
-  ConstraintEditorWindow *win = user_data;
-  const char *name;
-  GtkWidget *row, *box, *label, *button;
-
-  name = (const char *)g_object_get_data (G_OBJECT (item), "name");
-
-  row = gtk_list_box_row_new ();
-  g_object_set_data (G_OBJECT (row), "item", item);
-  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  label = gtk_label_new (name);
-  g_object_set (label,
-                "margin", 10,
-                NULL);
-  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-  gtk_widget_set_hexpand (label, TRUE);
-  gtk_container_add (GTK_CONTAINER (row), box);
-  gtk_container_add (GTK_CONTAINER (box), label);
-
-  if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item))
-    {
-      button = gtk_button_new_from_icon_name ("document-edit-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-      g_signal_connect (button, "clicked", G_CALLBACK (row_edit), win);
-      g_object_set_data (G_OBJECT (row), "edit", button);
-      gtk_container_add (GTK_CONTAINER (box), button);
-      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_container_add (GTK_CONTAINER (box), button);
-    }
-  else if (GTK_IS_WIDGET (item))
-    {
-      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
-      gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
-      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_container_add (GTK_CONTAINER (box), button);
-    }
-
-  return row;
-}
-
-static void
-constraint_editor_window_init (ConstraintEditorWindow *self)
-{
-  gtk_widget_init_template (GTK_WIDGET (self));
-
-  gtk_list_box_bind_model (GTK_LIST_BOX (self->list),
-                           constraint_view_get_model (CONSTRAINT_VIEW (self->view)),
-                           create_widget_func,
-                           self,
-                           NULL);
-}
-
-ConstraintEditorWindow *
-constraint_editor_window_new (ConstraintEditorApplication *application)
-{
-  return g_object_new (CONSTRAINT_EDITOR_WINDOW_TYPE,
-                       "application", application,
-                       NULL);
-}

demos/constraint-editor/constraint-editor-window.h

@@ -1,34 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#include "constraint-editor-application.h"
-
-
-#define CONSTRAINT_EDITOR_WINDOW_TYPE (constraint_editor_window_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintEditorWindow, constraint_editor_window, CONSTRAINT, EDITOR_WINDOW, GtkApplicationWindow)
-
-ConstraintEditorWindow * constraint_editor_window_new  (ConstraintEditorApplication  *application);
-
-gboolean                 constraint_editor_window_load (ConstraintEditorWindow       *self,
-                                                        GFile                        *file);

demos/constraint-editor/constraint-editor-window.ui

@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="ConstraintEditorWindow" parent="GtkApplicationWindow">
-    <style>
-      <class name="devel"/>
-    </style>
-    <property name="title" translatable="yes">GTK Constraint Editor</property>
-    <property name="default-width">1024</property>
-    <property name="default-height">768</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="header">
-        <property name="title" translatable="yes">GTK Constraint Editor</property>
-        <property name="show-title-buttons">1</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkPaned" id="paned">
-        <property name="orientation">horizontal</property>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkBox">
-                <property name="orientation">horizontal</property>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label">Add Child</property>
-                    <signal name="clicked" handler="add_child" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label">Add Guide</property>
-                    <signal name="clicked" handler="add_guide" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkButton">
-                    <property name="label">Add Constraint</property>
-                    <signal name="clicked" handler="add_constraint" swapped="yes"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="hscrollbar-policy">never</property>
-                <property name="vscrollbar-policy">automatic</property>
-                <property name="vexpand">1</property>
-                <child>
-                  <object class="GtkListBox" id="list">
-                    <property name="show-separators">1</property>
-                    <property name="selection-mode">none</property>
-                    <signal name="row-activated" handler="row_activated"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="ConstraintView" id="view">
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

demos/constraint-editor/constraint-editor.c

@@ -1,583 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "config.h"
-
-#include "constraint-editor.h"
-
-struct _ConstraintEditor
-{
-  GtkWidget parent_instance;
-
-  GtkWidget *grid;
-  GtkWidget *name;
-  GtkWidget *target;
-  GtkWidget *target_attr;
-  GtkWidget *relation;
-  GtkWidget *source;
-  GtkWidget *source_attr;
-  GtkWidget *multiplier;
-  GtkWidget *constant;
-  GtkWidget *strength;
-  GtkWidget *preview;
-  GtkWidget *button;
-
-  GtkConstraint *constraint;
-  GListModel *model;
-
-  gboolean constructed;
-};
-
-enum {
-  PROP_MODEL = 1,
-  PROP_CONSTRAINT,
-  LAST_PROP
-};
-
-static GParamSpec *pspecs[LAST_PROP];
-
-enum {
-  DONE,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE(ConstraintEditor, constraint_editor, GTK_TYPE_WIDGET);
-
-static const char *
-get_target_name (GtkConstraintTarget *target)
-{
-  if (target == NULL)
-    return "super";
-  else
-    return (const char *)g_object_get_data (G_OBJECT (target), "name");
-}
-
-static void
-constraint_target_combo (GListModel *model,
-                         GtkWidget  *combo,
-                         gboolean    is_source)
-{
-  int i;
-
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "super", "Super");
-
-  if (model)
-    {
-      for (i = 0; i < g_list_model_get_n_items (model); i++)
-        {
-          GObject *item = g_list_model_get_object (model, i);
-          const char *name;
-
-          if (GTK_IS_CONSTRAINT (item))
-            continue;
-
-          name = get_target_name (GTK_CONSTRAINT_TARGET (item));
-
-          gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), name, name);
-          g_object_unref (item);
-        }
-    }
-}
-
-static void
-constraint_attribute_combo (GtkWidget *combo,
-                            gboolean is_source)
-{
-  if (is_source)
-    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "none", "None");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "left", "Left");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "right", "Right");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "top", "Top");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "bottom", "Bottom");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "start", "Start");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "end", "End");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "width", "Width");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "height", "Height");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-x", "Center X");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "center-y", "Center Y");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "baseline", "Baseline");
-}
-
-static void
-constraint_relation_combo (GtkWidget *combo)
-{
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "le", "≤");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "eq", "=");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "ge", "≥");
-}
-
-static void
-constraint_strength_combo (GtkWidget *combo)
-{
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
-}
-
-static gpointer
-get_target (GListModel *model,
-            const char *id)
-{
-  int i;
-
-  if (strcmp ("super", id) == 0)
-    return NULL;
-
-  for (i = 0; i < g_list_model_get_n_items (model); i++)
-    {
-      GObject *item = g_list_model_get_object (model, i);
-      const char *name;
-      if (GTK_IS_CONSTRAINT (item))
-        continue;
-      name = (const char *)g_object_get_data (item, "name");
-      g_object_unref (item);
-      if (strcmp (name, id) == 0)
-        return item;
-    }
-
-  return NULL;
-}
-
-static GtkConstraintAttribute
-get_target_attr (const char *id)
-{
-  GtkConstraintAttribute attr;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_ATTRIBUTE);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  attr = value->value;
-  g_type_class_unref (class);
-
-  return attr;
-}
-
-static const char *
-get_attr_nick (GtkConstraintAttribute attr)
-{
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_ATTRIBUTE);
-  GEnumValue *value = g_enum_get_value (class, attr);
-  const char *nick = value->value_nick;
-  g_type_class_unref (class);
-
-  return nick;
-}
-
-static GtkConstraintRelation
-get_relation (const char *id)
-{
-  GtkConstraintRelation relation;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_RELATION);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  relation = value->value;
-  g_type_class_unref (class);
-
-  return relation;
-}
-
-static const char *
-get_relation_nick (GtkConstraintRelation relation)
-{
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_RELATION);
-  GEnumValue *value = g_enum_get_value (class, relation);
-  const char *nick = value->value_nick;
-  g_type_class_unref (class);
-
-  return nick;
-}
-
-static GtkConstraintStrength
-get_strength (const char *id)
-{
-  GtkConstraintStrength strength;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  strength = value->value;
-  g_type_class_unref (class);
-
-  return strength;
-}
-
-static const char *
-get_strength_nick (GtkConstraintStrength strength)
-{
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value (class, strength);
-  const char *nick = value->value_nick;
-  g_type_class_unref (class);
-
-  return nick;
-}
-
-static void
-create_constraint (GtkButton        *button,
-                   ConstraintEditor *editor)
-{
-  const char *id;
-  gpointer target;
-  GtkConstraintAttribute target_attr;
-  gpointer source;
-  GtkConstraintAttribute source_attr;
-  GtkConstraintRelation relation;
-  double multiplier;
-  double constant;
-  int strength;
-  GtkConstraint *constraint;
-  const char *name;
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  target = get_target (editor->model, id);
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
-  target_attr = get_target_attr (id);
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
-  source = get_target (editor->model, id);
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  source_attr = get_target_attr (id);
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->relation));
-  relation = get_relation (id);
-
-  multiplier = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->multiplier)), NULL);
-
-  constant = g_ascii_strtod (gtk_editable_get_text (GTK_EDITABLE (editor->constant)), NULL);
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
-  strength = get_strength (id);
-
-  name = gtk_editable_get_text (GTK_EDITABLE (editor->name));
-
-  constraint = gtk_constraint_new (target, target_attr,
-                                   relation,
-                                   source, source_attr,
-                                   multiplier,
-                                   constant,
-                                   strength);
-  g_object_set_data_full (G_OBJECT (constraint), "name", g_strdup (name), g_free);
-  g_signal_emit (editor, signals[DONE], 0, constraint);
-  g_object_unref (constraint);
-}
-
-static void
-source_attr_changed (ConstraintEditor *editor)
-{
-  const char *id;
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  if (strcmp (id, "none") == 0)
-    {
-      gtk_combo_box_set_active (GTK_COMBO_BOX (editor->source), -1);
-      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "");
-      gtk_widget_set_sensitive (editor->source, FALSE);
-      gtk_widget_set_sensitive (editor->multiplier, FALSE);
-    }
-  else
-    {
-      gtk_widget_set_sensitive (editor->source, TRUE);
-      gtk_widget_set_sensitive (editor->multiplier, TRUE);
-    }
-}
-
-static void
-update_preview (ConstraintEditor *editor)
-{
-  GString *str;
-  const char *name;
-  const char *attr;
-  char *relation;
-  const char *multiplier;
-  const char *constant;
-  double c, m;
-
-  if (!editor->constructed)
-    return;
-
-  str = g_string_new ("");
-
-  name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target));
-  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target_attr));
-  relation = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (editor->relation));
-
-  if (name == NULL)
-    name = "[ ]";
-
-  g_string_append_printf (str, "%s.%s %s ", name, attr, relation);
-  g_free (relation);
-
-  constant = gtk_editable_get_text (GTK_EDITABLE (editor->constant));
-  c = g_ascii_strtod (constant, NULL);
-
-  attr = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source_attr));
-  if (strcmp (attr, "none") != 0)
-    {
-      name = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source));
-      multiplier = gtk_editable_get_text (GTK_EDITABLE (editor->multiplier));
-      m = g_ascii_strtod (multiplier, NULL);
-
-      if (name == NULL)
-        name = "[ ]";
-
-      g_string_append_printf (str, "%s.%s", name, attr);
-
-      if (m != 1.0)
-        g_string_append_printf (str, " × %g", m);
-
-      if (c > 0.0)
-        g_string_append_printf (str, " + %g", c);
-      else if (c < 0.0)
-        g_string_append_printf (str, " - %g", -c);
-    }
-  else
-    g_string_append_printf (str, "%g", c);
-
-  gtk_label_set_label (GTK_LABEL (editor->preview), str->str);
-
-  g_string_free (str, TRUE);
-}
-
-static void
-update_button (ConstraintEditor *editor)
-{
-  if (gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->target)) != NULL &&
-      gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->source)) != NULL)
-    gtk_widget_set_sensitive (editor->button, TRUE);
-  else
-    gtk_widget_set_sensitive (editor->button, FALSE);
-}
-
-static void
-constraint_editor_init (ConstraintEditor *editor)
-{
-  gtk_widget_init_template (GTK_WIDGET (editor));
-}
-
-static int constraint_counter;
-
-static void
-constraint_editor_constructed (GObject *object)
-{
-  ConstraintEditor *editor = CONSTRAINT_EDITOR (object);
-
-  constraint_target_combo (editor->model, editor->target, FALSE);
-  constraint_attribute_combo (editor->target_attr, FALSE);
-  constraint_relation_combo (editor->relation);
-  constraint_target_combo (editor->model, editor->source, TRUE);
-  constraint_attribute_combo (editor->source_attr, TRUE);
-
-  constraint_strength_combo (editor->strength);
-
-  if (editor->constraint)
-    {
-      GtkConstraintTarget *target;
-      GtkConstraintAttribute attr;
-      GtkConstraintRelation relation;
-      GtkConstraintStrength strength;
-      const char *nick;
-      char *val;
-      double multiplier;
-      double constant;
-
-      nick = (char *)g_object_get_data (G_OBJECT (editor->constraint), "name");
-      gtk_editable_set_text (GTK_EDITABLE (editor->name), nick);
-
-      target = gtk_constraint_get_target (editor->constraint);
-      nick = get_target_name (target);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target), nick);
-
-      attr = gtk_constraint_get_target_attribute (editor->constraint);
-      nick = get_attr_nick (attr);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), nick);
-
-      target = gtk_constraint_get_source (editor->constraint);
-      nick = get_target_name (target);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source), nick);
-
-      attr = gtk_constraint_get_source_attribute (editor->constraint);
-      nick = get_attr_nick (attr);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), nick);
-
-      relation = gtk_constraint_get_relation (editor->constraint);
-      nick = get_relation_nick (relation);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), nick);
-
-      multiplier = gtk_constraint_get_multiplier (editor->constraint);
-      val = g_strdup_printf ("%g", multiplier);
-      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), val);
-      g_free (val);
-
-      constant = gtk_constraint_get_constant (editor->constraint);
-      val = g_strdup_printf ("%g", constant);
-      gtk_editable_set_text (GTK_EDITABLE (editor->constant), val);
-      g_free (val);
-
-      strength = gtk_constraint_get_strength (editor->constraint);
-      nick = get_strength_nick (strength);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
-
-      gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
-    }
-  else
-    {
-      char *name;
-
-      constraint_counter++;
-      name = g_strdup_printf ("Constraint %d", constraint_counter);
-      gtk_editable_set_text (GTK_EDITABLE (editor->name), name);
-      g_free (name);
-
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->target_attr), "left");
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->source_attr), "left");
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->relation), "eq");
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "required");
-
-      gtk_editable_set_text (GTK_EDITABLE (editor->multiplier), "1.0");
-      gtk_editable_set_text (GTK_EDITABLE (editor->constant), "0.0");
-
-      gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
-    }
-
-  editor->constructed = TRUE;
-  update_preview (editor);
-  update_button (editor);
-}
-
-static void
-constraint_editor_set_property (GObject      *object,
-                                guint         property_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-  ConstraintEditor *self = CONSTRAINT_EDITOR (object);
-
-  switch (property_id)
-    {
-    case PROP_MODEL:
-      self->model = g_value_dup_object (value);
-      break;
-
-    case PROP_CONSTRAINT:
-      self->constraint = g_value_dup_object (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-constraint_editor_get_property (GObject    *object,
-                                guint       property_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-  ConstraintEditor *self = CONSTRAINT_EDITOR (object);
-
-  switch (property_id)
-    {
-    case PROP_MODEL:
-      g_value_set_object (value, self->model);
-      break;
-
-    case PROP_CONSTRAINT:
-      g_value_set_object (value, self->constraint);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-constraint_editor_dispose (GObject *object)
-{
-  ConstraintEditor *self = (ConstraintEditor *)object;
-
-  g_clear_pointer (&self->grid, gtk_widget_unparent);
-  g_clear_object (&self->model);
-  g_clear_object (&self->constraint);
-
-  G_OBJECT_CLASS (constraint_editor_parent_class)->dispose (object);
-}
-
-static void
-constraint_editor_class_init (ConstraintEditorClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->constructed = constraint_editor_constructed;
-  object_class->dispose = constraint_editor_dispose;
-  object_class->set_property = constraint_editor_set_property;
-  object_class->get_property = constraint_editor_get_property;
-
-  pspecs[PROP_CONSTRAINT] =
-    g_param_spec_object ("constraint", "constraint", "constraint",
-                         GTK_TYPE_CONSTRAINT,
-                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
-
-  pspecs[PROP_MODEL] =
-    g_param_spec_object ("model", "model", "model",
-                         G_TYPE_LIST_MODEL,
-                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (object_class, LAST_PROP, pspecs);
-
-  signals[DONE] =
-    g_signal_new ("done",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  NULL,
-                  G_TYPE_NONE, 1, GTK_TYPE_CONSTRAINT);
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-
-  gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/org/gtk/gtk4/constraint-editor/constraint-editor.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, grid);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, name);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, target);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, target_attr);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, relation);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, source);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, source_attr);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, multiplier);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, constant);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, strength);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, preview);
-  gtk_widget_class_bind_template_child (widget_class, ConstraintEditor, button);
-
-  gtk_widget_class_bind_template_callback (widget_class, update_preview);
-  gtk_widget_class_bind_template_callback (widget_class, update_button);
-  gtk_widget_class_bind_template_callback (widget_class, create_constraint);
-  gtk_widget_class_bind_template_callback (widget_class, source_attr_changed);
-}
-
-ConstraintEditor *
-constraint_editor_new (GListModel    *model,
-                       GtkConstraint *constraint)
-{
-  return g_object_new (CONSTRAINT_EDITOR_TYPE,
-                       "model", model,
-                       "constraint", constraint,
-                       NULL);
-}

demos/constraint-editor/constraint-editor.css

@@ -1,12 +0,0 @@
-constraintview {
-  background: black;
-  color: white;
-}
-
-constraintview .child {
-  background: red;
-}
-
-constraintview .guide {
-  background: blue;
-}

demos/constraint-editor/constraint-editor.gresource.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gtk/gtk4/constraint-editor">
-    <file preprocess="xml-stripblanks">constraint-editor-window.ui</file>
-    <file preprocess="xml-stripblanks">constraint-editor.ui</file>
-    <file preprocess="xml-stripblanks">guide-editor.ui</file>
-    <file>constraint-editor.css</file>
-  </gresource>
-</gresources>

demos/constraint-editor/constraint-editor.h

@@ -1,29 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define CONSTRAINT_EDITOR_TYPE (constraint_editor_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintEditor, constraint_editor, CONSTRAINT, EDITOR, GtkWidget)
-
-ConstraintEditor * constraint_editor_new (GListModel    *model,
-                                          GtkConstraint *constraint);

demos/constraint-editor/constraint-editor.ui

@@ -1,180 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="ConstraintEditor" parent="GtkWidget">
-    <child>
-      <object class="GtkGrid" id="grid">
-        <property name="margin">20</property>
-        <property name="row-spacing">10</property>
-        <property name="column-spacing">10</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Name</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry" id="name">
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Target</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="target">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <signal name="changed" handler="update_button" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="target_attr">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Relation</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="relation">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Source</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="source">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <signal name="changed" handler="update_button" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="source_attr">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <signal name="changed" handler="source_attr_changed" swapped="yes"/>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Multiplier</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry" id="multiplier">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Constant</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">5</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry" id="constant">
-            <signal name="changed" handler="update_preview" swapped="yes"/>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">5</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Strength</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">6</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="strength">
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">6</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="preview">
-            <property name="xalign">0</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">7</property>
-              <property name="column-span">2</property>
-            </layout>
-            <attributes>
-              <attribute name="scale" value="1.44"/>
-            </attributes>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button">
-            <property name="label">Create</property>
-            <signal name="clicked" handler="create_constraint"/>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">8</property>
-            </layout>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

demos/constraint-editor/constraint-view-child.c

@@ -1,93 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "constraint-view-child.h"
-
-struct _ConstraintViewChild
-{
-  GObject parent_instance;
-
-  char *name;
-};
-
-enum {
-  PROP_NAME = 1,
-  LAST_PROP
-};
-
-static GParamSpec props[LAST_PROP];
-
-G_DEFINE_TYPE (ConstraintViewChild, constraint_view_child, G_TYPE_OBJECT)
-
-static void
-constraint_view_child_init (ConstraintViewChild *child)
-{
-}
-
-static void
-constraint_view_child_finalize (GObject *object)
-{
-  ConstraintViewChild *child = CONSTRAINT_VIEW_CHILD (object);
-
-  g_free (child->name);
-
-  G_OBJECT_CLASS (constraint_view_child_parent_class)->finalize (object);
-}
-
-static void
-constraint_view_child_set_property (GObject *object,
-                                    
-static void
-constraint_view_child_class_init (ConstraintViewChildClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = constraint_view_child_finalize;
-  object_class->get_property = constraint_view_child_get_property;
-  object_class->set_property = constraint_view_child_set_property;
-
-  props[PROP_NAME] =
-    g_param_spec_string ("name", "name", "name",
-                         NULL,
-                         G_PARAM_READWRITE);
-
-  g_object_class_install_properties (object_class, LAST_PROP, props);
-}
-
-#define CONSTRAINT_VIEW_CHILD_TYPE (constraint_view_get_type ())
-
-G_DECLARE_TYPE (ConstraintViewChild, constraint_view_child, CONSTRAINT, VIEW_CHILD, GObject)
-
-#define CONSTRAINT_VIEW_WIDGET_TYPE (constraint_view_widget_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewWidget, constraint_view_widget, CONSTRAINT, VIEW_WIDGET, ConstraintViewChild)
-
-ConstraintViewWidget * constraint_view_widget_new (void);
-
-#define CONSTRAINT_VIEW_GUIDE_TYPE (constraint_view_guide_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewGuide, constraint_view_guide, CONSTRAINT, VIEW_GUIDE, ConstraintViewChild)
-
-ConstraintViewGuide * constraint_view_guide_new (void);
-
-#define CONSTRAINT_VIEW_CONSTRAINT_TYPE (constraint_view_constraint_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewConstraint, constraint_view_constraint, CONSTRAINT, VIEW_CONSTRAINT, ConstraintViewChild)
-
-ConstraintViewGuide * constraint_view_constraint_new (void);

demos/constraint-editor/constraint-view-child.h

@@ -1,44 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define CONSTRAINT_VIEW_CHILD_TYPE (constraint_view_get_type ())
-
-G_DECLARE_TYPE (ConstraintViewChild, constraint_view_child, CONSTRAINT, VIEW_CHILD, GObject)
-
-#define CONSTRAINT_VIEW_WIDGET_TYPE (constraint_view_widget_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewWidget, constraint_view_widget, CONSTRAINT, VIEW_WIDGET, ConstraintViewChild)
-
-ConstraintViewWidget * constraint_view_widget_new (void);
-
-#define CONSTRAINT_VIEW_GUIDE_TYPE (constraint_view_guide_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewGuide, constraint_view_guide, CONSTRAINT, VIEW_GUIDE, ConstraintViewChild)
-
-ConstraintViewGuide * constraint_view_guide_new (void);
-
-#define CONSTRAINT_VIEW_CONSTRAINT_TYPE (constraint_view_constraint_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintViewConstraint, constraint_view_constraint, CONSTRAINT, VIEW_CONSTRAINT, ConstraintViewChild)
-
-ConstraintViewGuide * constraint_view_constraint_new (void);

demos/constraint-editor/constraint-view.c

@@ -1,277 +0,0 @@
-/* Copyright (C) 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser 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
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#include <gtk/gtk.h>
-#include "constraint-view.h"
-
-struct _ConstraintView
-{
-  GtkWidget parent;
-
-  GListStore *store;
-};
-
-G_DEFINE_TYPE (ConstraintView, constraint_view, GTK_TYPE_WIDGET);
-
-static void
-constraint_view_dispose (GObject *object)
-{
-  ConstraintView *view = CONSTRAINT_VIEW (object);
-  GtkWidget *child;
-
-  while ((child = gtk_widget_get_first_child (GTK_WIDGET (view))) != NULL)
-    gtk_widget_unparent (child);
-
-  g_clear_object (&view->store);
-
-  G_OBJECT_CLASS (constraint_view_parent_class)->dispose (object);
-}
-
-static void
-constraint_view_class_init (ConstraintViewClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->dispose = constraint_view_dispose;
-
-  gtk_widget_class_set_css_name (widget_class, "constraintview");
-}
-
-static void
-constraint_view_init (ConstraintView *self)
-{
-  gtk_widget_set_layout_manager (GTK_WIDGET (self),
-                                 gtk_constraint_layout_new ());
-
-  self->store = g_list_store_new (G_TYPE_OBJECT);
-}
-
-ConstraintView *
-constraint_view_new (void)
-{
-  return g_object_new (CONSTRAINT_VIEW_TYPE, NULL);
-}
-
-void
-constraint_view_add_child (ConstraintView *view,
-                           const char     *name)
-{
-  GtkWidget *frame;
-  GtkWidget *label;
-
-  label = gtk_label_new (name);
-  frame = gtk_frame_new (NULL);
-  gtk_style_context_add_class (gtk_widget_get_style_context (frame), "child");
-  g_object_set_data_full (G_OBJECT (frame), "name", g_strdup (name), g_free);
-  gtk_container_add (GTK_CONTAINER (frame), label);
-  gtk_widget_set_parent (frame, GTK_WIDGET (view));
-
-  g_list_store_append (view->store, frame);
-}
-
-void
-constraint_view_remove_child (ConstraintView *view,
-                              GtkWidget      *child)
-{
-  int i;
-
-  gtk_widget_unparent (child);
-
-  for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (view->store)); i++)
-    {
-      if (g_list_model_get_item (G_LIST_MODEL (view->store), i) == (GObject*)child)
-        {
-          g_list_store_remove (view->store, i);
-          break;
-        }
-    }
-}
-
-void
-constraint_view_add_guide (ConstraintView *view,
-                           GtkConstraintGuide *guide)
-{
-  GtkLayoutManager *manager;
-  GtkWidget *frame;
-  GtkWidget *label;
-  const char *name;
-  GtkConstraint *constraint;
-
-  name = (const char *)g_object_get_data (G_OBJECT (guide), "name");
-
-  label = gtk_label_new (name);
-  frame = gtk_frame_new (NULL);
-  gtk_style_context_add_class (gtk_widget_get_style_context (frame), "guide");
-  g_object_set_data_full (G_OBJECT (frame), "name", g_strdup (name), g_free);
-  gtk_container_add (GTK_CONTAINER (frame), label);
-  gtk_widget_set_parent (frame, GTK_WIDGET (view));
-
-  g_object_set_data (G_OBJECT (guide), "frame", frame);
-  g_object_set_data (G_OBJECT (guide), "label", label);
-
-  manager = gtk_widget_get_layout_manager (GTK_WIDGET (view));
-  gtk_constraint_layout_add_guide (GTK_CONSTRAINT_LAYOUT (manager),
-                                   g_object_ref (guide));
-
-  constraint = gtk_constraint_new (frame,
-                                   GTK_CONSTRAINT_ATTRIBUTE_LEFT,
-                                   GTK_CONSTRAINT_RELATION_EQ,
-                                   guide,
-                                   GTK_CONSTRAINT_ATTRIBUTE_LEFT,
-                                   1.0, 0.0,
-                                   GTK_CONSTRAINT_STRENGTH_REQUIRED);
-  gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                        constraint);
-  g_object_set_data (G_OBJECT (guide), "left-constraint", constraint);
-
-  constraint = gtk_constraint_new (frame,
-                                   GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                                   GTK_CONSTRAINT_RELATION_EQ,
-                                   guide,
-                                   GTK_CONSTRAINT_ATTRIBUTE_TOP,
-                                   1.0, 0.0,
-                                   GTK_CONSTRAINT_STRENGTH_REQUIRED);
-  gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                        constraint);
-  g_object_set_data (G_OBJECT (guide), "top-constraint", constraint);
-
-  constraint = gtk_constraint_new (frame,
-                                   GTK_CONSTRAINT_ATTRIBUTE_WIDTH,
-                                   GTK_CONSTRAINT_RELATION_EQ,
-                                   guide,
-                                   GTK_CONSTRAINT_ATTRIBUTE_WIDTH,
-                                   1.0, 0.0,
-                                   GTK_CONSTRAINT_STRENGTH_REQUIRED);
-  gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                        constraint);
-  g_object_set_data (G_OBJECT (guide), "width-constraint", constraint);
-
-  constraint = gtk_constraint_new (frame,
-                                   GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
-                                   GTK_CONSTRAINT_RELATION_EQ,
-                                   guide,
-                                   GTK_CONSTRAINT_ATTRIBUTE_HEIGHT,
-                                   1.0, 0.0,
-                                   GTK_CONSTRAINT_STRENGTH_REQUIRED);
-  gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                        constraint);
-
-  g_object_set_data (G_OBJECT (guide), "height-constraint", constraint);
-
-  g_list_store_append (view->store, guide);
-}
-
-void
-constraint_view_guide_changed (ConstraintView     *view,
-                               GtkConstraintGuide *guide)
-{
-  GtkWidget *label;
-  const char *name;
-  int i;
-
-  name = (const char *)g_object_get_data (G_OBJECT (guide), "name");
-  label = (GtkWidget *)g_object_get_data (G_OBJECT (guide), "label");
-  gtk_label_set_label (GTK_LABEL (label), name);
-
-  for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (view->store)); i++)
-    {
-      if (g_list_model_get_item (G_LIST_MODEL (view->store), i) == (GObject*)guide)
-        {
-          g_list_model_items_changed (G_LIST_MODEL (view->store), i, 1, 1);
-          break;
-        }
-    }
-}
-
-void
-constraint_view_remove_guide (ConstraintView     *view,
-                              GtkConstraintGuide *guide)
-{
-  GtkLayoutManager *manager;
-  GtkWidget *frame;
-  GtkConstraint *constraint;
-  int i;
-
-  manager = gtk_widget_get_layout_manager (GTK_WIDGET (view));
-
-  constraint = (GtkConstraint*)g_object_get_data (G_OBJECT (guide), "left-constraint");
-  gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                           constraint);
-  constraint = (GtkConstraint*)g_object_get_data (G_OBJECT (guide), "top-constraint");
-  gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                           constraint);
-  constraint = (GtkConstraint*)g_object_get_data (G_OBJECT (guide), "width-constraint");
-  gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                           constraint);
-  constraint = (GtkConstraint*)g_object_get_data (G_OBJECT (guide), "height-constraint");
-  gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                           constraint);
-
-  frame = (GtkWidget *)g_object_get_data (G_OBJECT (guide), "frame");
-  gtk_widget_unparent (frame);
-
-  gtk_constraint_layout_remove_guide (GTK_CONSTRAINT_LAYOUT (manager),
-                                      guide);
-
-  for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (view->store)); i++)
-    {
-      if (g_list_model_get_item (G_LIST_MODEL (view->store), i) == (GObject*)guide)
-        {
-          g_list_store_remove (view->store, i);
-          break;
-        }
-    }
-}
-
-void
-constraint_view_add_constraint (ConstraintView *view,
-                                GtkConstraint  *constraint)
-{
-  GtkLayoutManager *manager;
-
-  manager = gtk_widget_get_layout_manager (GTK_WIDGET (view));
-  gtk_constraint_layout_add_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                        g_object_ref (constraint));
-
-  g_list_store_append (view->store, constraint);
-}
-
-void
-constraint_view_remove_constraint (ConstraintView *view,
-                                   GtkConstraint  *constraint)
-{
-  GtkLayoutManager *manager;
-  int i;
-
-  manager = gtk_widget_get_layout_manager (GTK_WIDGET (view));
-  gtk_constraint_layout_remove_constraint (GTK_CONSTRAINT_LAYOUT (manager),
-                                           constraint);
-  for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (view->store)); i++)
-    {
-      if (g_list_model_get_item (G_LIST_MODEL (view->store), i) == (GObject*)constraint)
-        {
-          g_list_store_remove (view->store, i);
-          break;
-        }
-    }
-}
-
-GListModel *
-constraint_view_get_model (ConstraintView *view)
-{
-  return G_LIST_MODEL (view->store);
-}

demos/constraint-editor/constraint-view.h

@@ -1,44 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define CONSTRAINT_VIEW_TYPE (constraint_view_get_type ())
-
-G_DECLARE_FINAL_TYPE (ConstraintView, constraint_view, CONSTRAINT, VIEW, GtkWidget)
-
-ConstraintView * constraint_view_new (void);
-
-void             constraint_view_add_child (ConstraintView *view,
-                                            const char     *name);
-void             constraint_view_remove_child (ConstraintView *view,
-                                               GtkWidget      *child);
-void             constraint_view_add_guide (ConstraintView     *view,
-                                            GtkConstraintGuide *guide);
-void             constraint_view_remove_guide (ConstraintView     *view,
-                                               GtkConstraintGuide *guide);
-void             constraint_view_guide_changed (ConstraintView     *view,
-                                                GtkConstraintGuide *guide);
-void             constraint_view_add_constraint (ConstraintView *view,
-                                                 GtkConstraint  *constraint);
-void             constraint_view_remove_constraint (ConstraintView *view,
-                                                    GtkConstraint  *constraint);
-GListModel *     constraint_view_get_model (ConstraintView *view);

demos/constraint-editor/guide-editor.c

@@ -1,316 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#include "config.h"
-
-#include "guide-editor.h"
-
-struct _GuideEditor
-{
-  GtkWidget parent_instance;
-
-  GtkWidget *grid;
-  GtkWidget *name;
-  GtkWidget *min_width;
-  GtkWidget *min_height;
-  GtkWidget *nat_width;
-  GtkWidget *nat_height;
-  GtkWidget *max_width;
-  GtkWidget *max_height;
-  GtkWidget *strength;
-  GtkWidget *button;
-
-  GtkConstraintGuide *guide;
-
-  gboolean constructed;
-};
-
-enum {
-  PROP_GUIDE = 1,
-  LAST_PROP
-};
-
-static GParamSpec *pspecs[LAST_PROP];
-
-enum {
-  DONE,
-  LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL];
-
-G_DEFINE_TYPE(GuideEditor, guide_editor, GTK_TYPE_WIDGET);
-
-static void
-guide_strength_combo (GtkWidget *combo)
-{
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "weak", "Weak");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "medium", "Medium");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "strong", "Strong");
-  gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "required", "Required");
-}
-
-static GtkConstraintStrength
-get_strength (const char *id)
-{
-  GtkConstraintStrength strength;
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value_by_nick (class, id);
-  strength = value->value;
-  g_type_class_unref (class);
-
-  return strength;
-}
-
-const char *
-get_strength_nick (GtkConstraintStrength strength)
-{
-  GEnumClass *class = g_type_class_ref (GTK_TYPE_CONSTRAINT_STRENGTH);
-  GEnumValue *value = g_enum_get_value (class, strength);
-  const char *nick = value->value_nick;
-  g_type_class_unref (class);
-
-  return nick;
-}
-
-static void
-create_guide (GtkButton   *button,
-              GuideEditor *editor)
-{
-#if 0
-  const char *id;
-  int strength;
-#endif
-  const char *name;
-  int w, h;
-  GtkConstraintGuide *guide;
-
-  //guide = gtk_constraint_guide_new ();
-  if (editor->guide)
-    guide = g_object_ref (editor->guide);
-  else
-    guide = g_object_new (GTK_TYPE_CONSTRAINT_GUIDE, NULL);
-
-  name = gtk_editable_get_text (GTK_EDITABLE (editor->name));
-  g_object_set_data_full (G_OBJECT (guide), "name", g_strdup (name), g_free);
-
-  w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->min_width));
-  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->min_height));
-  //gtk_constraint_guide_set_min_size (guide, w, h);
-  g_object_set (guide, "min-width", w, "min-height", h, NULL);
-
-  w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->nat_width));
-  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->nat_height));
-  //gtk_constraint_guide_set_nat_size (guide, w, h);
-  g_object_set (guide, "nat-width", w, "nat-height", h, NULL);
-
-#if 0
-  w = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_width));
-  h = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (editor->max_height));
-  gtk_constraint_guide_set_max_size (guide, w, h);
-
-  id = gtk_combo_box_get_active_id (GTK_COMBO_BOX (editor->strength));
-  strength = get_strength (id);
-  gtk_constraint_guide_set_strength (guide, strength);
-#endif
-
-  g_signal_emit (editor, signals[DONE], 0, guide);
-  g_object_unref (guide);
-}
-
-static void
-guide_editor_init (GuideEditor *editor)
-{
-  gtk_widget_init_template (GTK_WIDGET (editor));
-}
-
-static int guide_counter;
-
-static void
-guide_editor_constructed (GObject *object)
-{
-  GuideEditor *editor = GUIDE_EDITOR (object);
-
-  guide_strength_combo (editor->strength);
-
-  gtk_widget_set_sensitive (editor->max_width, FALSE);
-  gtk_widget_set_sensitive (editor->max_height, FALSE);
-  gtk_widget_set_sensitive (editor->strength, FALSE);
-
-  if (editor->guide)
-    {
-#if 0
-      GtkConstaintStrength strength;
-#endif
-      const char *nick;
-      int w, h;
-
-      nick = (char *)g_object_get_data (G_OBJECT (editor->guide), "name");
-      gtk_editable_set_text (GTK_EDITABLE (editor->name), nick);
-
-      //gtk_constaint_guide_get_min_size (editor->guide, &w, &h);
-      g_object_get (editor->guide, "min-width", &w, "min-height", &h, NULL);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_width), w);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_height), h);
-
-      //gtk_constaint_guide_get_nat_size (editor->guide, &w, &h);
-      g_object_get (editor->guide, "nat-width", &w, "nat-height", &h, NULL);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_width), w);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_height), h);
-
-#if 0
-      gtk_constaint_guide_get_max_size (editor->guide, &w, &h);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), w);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), h);
-
-      strength = gtk_guide_get_strength (editor->guide);
-      nick = get_strength_nick (strength);
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), nick);
-#endif
-
-      gtk_button_set_label (GTK_BUTTON (editor->button), "Apply");
-    }
-  else
-    {
-      char *name;
-
-      guide_counter++;
-      name = g_strdup_printf ("Guide %d", guide_counter);
-      gtk_editable_set_text (GTK_EDITABLE (editor->name), name);
-      g_free (name);
-
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_width), 0.0);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->min_height), 0.0);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_width), 0.0);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->nat_height), 0.0);
-#if 0
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_width), G_MAXINT);
-      gtk_spin_button_set_value (GTK_SPIN_BUTTON (editor->max_height), G_MAXINT);
-
-      gtk_combo_box_set_active_id (GTK_COMBO_BOX (editor->strength), "medium");
-#endif
-
-      gtk_button_set_label (GTK_BUTTON (editor->button), "Create");
-    }
-
-  editor->constructed = TRUE;
-}
-
-static void
-guide_editor_set_property (GObject      *object,
-                           guint         property_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  GuideEditor *self = GUIDE_EDITOR (object);
-
-  switch (property_id)
-    {
-    case PROP_GUIDE:
-      self->guide = g_value_dup_object (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-guide_editor_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  GuideEditor *self = GUIDE_EDITOR (object);
-
-  switch (property_id)
-    {
-    case PROP_GUIDE:
-      g_value_set_object (value, self->guide);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-guide_editor_dispose (GObject *object)
-{
-  GuideEditor *self = (GuideEditor *)object;
-
-  g_clear_pointer (&self->grid, gtk_widget_unparent);
-  g_clear_object (&self->guide);
-
-  G_OBJECT_CLASS (guide_editor_parent_class)->dispose (object);
-}
-
-static void
-guide_editor_class_init (GuideEditorClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->constructed = guide_editor_constructed;
-  object_class->dispose = guide_editor_dispose;
-  object_class->set_property = guide_editor_set_property;
-  object_class->get_property = guide_editor_get_property;
-
-  pspecs[PROP_GUIDE] =
-    g_param_spec_object ("guide", "guide", "guide",
-                         GTK_TYPE_CONSTRAINT_GUIDE,
-                         G_PARAM_READWRITE|G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (object_class, LAST_PROP, pspecs);
-
-  signals[DONE] =
-    g_signal_new ("done",
-                  G_TYPE_FROM_CLASS (object_class),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL,
-                  NULL,
-                  G_TYPE_NONE, 1, GTK_TYPE_CONSTRAINT_GUIDE);
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-
-  gtk_widget_class_set_template_from_resource (widget_class,
-                                               "/org/gtk/gtk4/constraint-editor/guide-editor.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, grid);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, name);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, min_width);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, min_height);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, nat_width);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, nat_height);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, max_width);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, max_height);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, strength);
-  gtk_widget_class_bind_template_child (widget_class, GuideEditor, button);
-
-  gtk_widget_class_bind_template_callback (widget_class, create_guide);
-}
-
-GuideEditor *
-guide_editor_new (GtkConstraintGuide *guide)
-{
-  return g_object_new (GUIDE_EDITOR_TYPE,
-                       "guide", guide,
-                       NULL);
-}

demos/constraint-editor/guide-editor.h

@@ -1,28 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define GUIDE_EDITOR_TYPE (guide_editor_get_type ())
-
-G_DECLARE_FINAL_TYPE (GuideEditor, guide_editor, GUIDE, EDITOR, GtkWidget)
-
-GuideEditor * guide_editor_new (GtkConstraintGuide  *guide);

demos/constraint-editor/guide-editor.ui

@@ -1,188 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkAdjustment" id="min_width_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="min_height_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="nat_width_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="nat_height_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="max_width_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <object class="GtkAdjustment" id="max_height_adj">
-    <property name="lower">0</property>
-    <property name="upper">2147483647</property>
-    <property name="step-increment">1</property>
-    <property name="page-increment">10</property>
-    <property name="page-size">0</property>
-  </object>
-  <template class="GuideEditor" parent="GtkWidget">
-    <child>
-      <object class="GtkGrid" id="grid">
-        <property name="margin">20</property>
-        <property name="row-spacing">10</property>
-        <property name="column-spacing">10</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Name</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkEntry" id="name">
-            <property name="max-width-chars">20</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
-              <property name="column-span">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Min Size</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="min_width">
-            <property name="adjustment">min_width_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="min_height">
-            <property name="adjustment">min_height_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Nat Size</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="nat_width">
-            <property name="adjustment">nat_width_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="nat_height">
-            <property name="adjustment">nat_height_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Max Size</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="max_width">
-            <property name="adjustment">max_width_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkSpinButton" id="max_height">
-            <property name="adjustment">max_height_adj</property>
-            <property name="max-width-chars">5</property>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="label">Strength</property>
-            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="strength">
-            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
-              <property name="column-span">2</property>
-            </layout>
-          </object>
-        </child>
-        <child>
-          <object class="GtkButton" id="button">
-            <property name="label">Create</property>
-            <signal name="clicked" handler="create_guide"/>
-            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">5</property>
-            </layout>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

demos/constraint-editor/main.c

@@ -1,28 +0,0 @@
-/*
- * Copyright © 2019 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Matthias Clasen <mclasen@redhat.com>
- */
-
-#include "config.h"
-
-#include <constraint-editor-application.h>
-
-int
-main (int argc, char *argv[])
-{
-  return g_application_run (G_APPLICATION (constraint_editor_application_new ()), argc, argv);
-}

demos/constraint-editor/meson.build

@@ -1,19 +0,0 @@
-constraint_editor_sources = [
-  'main.c',
-  'constraint-editor-application.c',
-  'constraint-editor-window.c',
-  'constraint-view.c',
-  'constraint-editor.c',
-  'guide-editor.c',
-]
-
-constraint_editor_resources = gnome.compile_resources('constraint_editor_resources',
-                                                      'constraint-editor.gresource.xml',
-                                                      source_dir: '.')
-
-executable('gtk4-constraint-editor',
-           constraint_editor_sources, constraint_editor_resources,
-           dependencies: libgtk_dep,
-           include_directories: confinc,
-           gui_app: true,
-           install: false)

demos/gtk-demo/constraints3.c

@@ -1,165 +0,0 @@
-/* Constraints/VFL
- *
- * GtkConstraintLayout allows defining constraints using a
- * compact syntax called Visual Format Language, or VFL.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-G_DECLARE_FINAL_TYPE (VflGrid, vfl_grid, VFL, GRID, GtkWidget)
-
-struct _VflGrid
-{
-  GtkWidget parent_instance;
-
-  GtkWidget *button1, *button2;
-  GtkWidget *button3;
-};
-
-G_DEFINE_TYPE (VflGrid, vfl_grid, GTK_TYPE_WIDGET)
-
-static void
-vfl_grid_destroy (GtkWidget *widget)
-{
-  VflGrid *self = VFL_GRID (widget);
-
-  g_clear_pointer (&self->button1, gtk_widget_destroy);
-  g_clear_pointer (&self->button2, gtk_widget_destroy);
-  g_clear_pointer (&self->button3, gtk_widget_destroy);
-
-  GTK_WIDGET_CLASS (vfl_grid_parent_class)->destroy (widget);
-}
-
-static void
-vfl_grid_class_init (VflGridClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  widget_class->destroy = vfl_grid_destroy;
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_CONSTRAINT_LAYOUT);
-}
-
-/* Layout:
- *
- *   +-----------------------------+
- *   | +-----------+ +-----------+ |
- *   | |  Child 1  | |  Child 2  | |
- *   | +-----------+ +-----------+ |
- *   | +-------------------------+ |
- *   | |         Child 3         | |
- *   | +-------------------------+ |
- *   +-----------------------------+
- *
- * Constraints:
- *
- *   super.start = child1.start - 8
- *   child1.width = child2.width
- *   child1.end = child2.start - 12
- *   child2.end = super.end - 8
- *   super.start = child3.start - 8
- *   child3.end = super.end - 8
- *   super.top = child1.top - 8
- *   super.top = child2.top - 8
- *   child1.bottom = child3.top - 12
- *   child2.bottom = child3.top - 12
- *   child3.height = child1.height
- *   child3.height = child2.height
- *   child3.bottom = super.bottom - 8
- *
- * Visual format:
- *
- *   H:|-8-[view1(==view2)-12-[view2]-8-|
- *   H:|-8-[view3]-8-|
- *   V:|-8-[view1]-12-[view3(==view1)]-8-|
- *   V:|-8-[view2]-12-[view3(==view2)]-8-|
- */
-static void
-build_constraints (VflGrid          *self,
-                   GtkConstraintLayout *manager)
-{
-  const char * const vfl[] = {
-    "H:|-[button1(==button2)]-12-[button2]-|",
-    "H:|-[button3]-|",
-    "V:|-[button1]-12-[button3(==button1)]-|",
-    "V:|-[button2]-12-[button3(==button2)]-|",
-  };
-  GError *error = NULL;
-
-  gtk_constraint_layout_add_constraints_from_description (manager, vfl, G_N_ELEMENTS (vfl),
-                                                          8, 8,
-                                                          &error,
-                                                          "button1", self->button1,
-                                                          "button2", self->button2,
-                                                          "button3", self->button3,
-                                                          NULL);
-  if (error != NULL)
-    {
-      g_printerr ("VFL parsing error:\n%s", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-vfl_grid_init (VflGrid *self)
-{
-  GtkWidget *widget = GTK_WIDGET (self);
-
-  self->button1 = gtk_button_new_with_label ("Child 1");
-  gtk_widget_set_parent (self->button1, widget);
-  gtk_widget_set_name (self->button1, "button1");
-
-  self->button2 = gtk_button_new_with_label ("Child 2");
-  gtk_widget_set_parent (self->button2, widget);
-  gtk_widget_set_name (self->button2, "button2");
-
-  self->button3 = gtk_button_new_with_label ("Child 3");
-  gtk_widget_set_parent (self->button3, widget);
-  gtk_widget_set_name (self->button3, "button3");
-
-  GtkLayoutManager *manager = gtk_widget_get_layout_manager (GTK_WIDGET (self));
-  build_constraints (self, GTK_CONSTRAINT_LAYOUT (manager));
-}
-
-GtkWidget *
-do_constraints3 (GtkWidget *do_widget)
-{
- static GtkWidget *window;
-
- if (!window)
-   {
-     GtkWidget *header, *box, *grid, *button;
-
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-     gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
-
-     header = gtk_header_bar_new ();
-     gtk_header_bar_set_title (GTK_HEADER_BAR (header), "Constraints");
-     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
-     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_signal_connect (window, "destroy",
-                       G_CALLBACK (gtk_widget_destroyed), &window);
-
-     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-     gtk_container_add (GTK_CONTAINER (window), box);
-
-     grid = g_object_new (vfl_grid_get_type (), NULL);
-     gtk_widget_set_hexpand (grid, TRUE);
-     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_container_add (GTK_CONTAINER (box), grid);
-
-     button = gtk_button_new_with_label ("Close");
-     gtk_container_add (GTK_CONTAINER (box), button);
-     gtk_widget_set_hexpand (grid, TRUE);
-     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_widget_destroy), window);
-   }
-
- if (!gtk_widget_get_visible (window))
-   gtk_widget_show (window);
- else
-   gtk_widget_destroy (window);
-
- return window;
-}

demos/gtk-demo/demo.gresource.xml

@@ -152,7 +152,6 @@
     <file>combobox.c</file>
     <file>constraints.c</file>
     <file>constraints2.c</file>
-    <file>constraints3.c</file>
     <file>css_accordion.c</file>
     <file>css_basics.c</file>
     <file>css_blendmodes.c</file>

demos/gtk-demo/meson.build

@@ -10,7 +10,6 @@ demos = files([
   'combobox.c',
   'constraints.c',
   'constraints2.c',
-  'constraints3.c',
   'css_accordion.c',
   'css_basics.c',
   'css_blendmodes.c',

demos/meson.build

@@ -1,4 +1,3 @@
-subdir('constraint-editor')
 subdir('gtk-demo')
 subdir('icon-browser')
 subdir('node-editor')

gtk/gtkactionmuxer.c

@@ -561,6 +561,13 @@ prop_actions_connect (GtkActionMuxer *muxer)
     }
 }
 
+static void
+prop_actions_disconnect (GtkActionMuxer *muxer)
+{
+  if (muxer->widget)
+    g_signal_handlers_disconnect_by_func (muxer->widget,
+                                          prop_action_notify, muxer);
+}
 
 static gboolean
 gtk_action_muxer_query_action (GActionGroup        *action_group,
@@ -812,6 +819,8 @@ gtk_action_muxer_dispose (GObject *object)
 {
   GtkActionMuxer *muxer = GTK_ACTION_MUXER (object);
 
+  prop_actions_disconnect (muxer);
+
   if (muxer->parent)
   {
     g_signal_handlers_disconnect_by_func (muxer->parent, gtk_action_muxer_action_added_to_parent, muxer);

gtk/gtkconstraintexpression.c

@@ -55,12 +55,9 @@ static guint64 gtk_constraint_variable_next_id;
 
 static void
 gtk_constraint_variable_init (GtkConstraintVariable *variable,
-                              const char *prefix,
                               const char *name)
 {
   variable->_id = gtk_constraint_variable_next_id++;
-
-  variable->prefix = g_intern_string (prefix);
   variable->name = g_intern_string (name);
   variable->prefix = NULL;
   variable->value = 0.0;
@@ -84,7 +81,7 @@ gtk_constraint_variable_new_dummy (const char *name)
 {
   GtkConstraintVariable *res = g_rc_box_new (GtkConstraintVariable);
 
-  gtk_constraint_variable_init (res, NULL, name);
+  gtk_constraint_variable_init (res, name);
 
   res->_type = GTK_CONSTRAINT_SYMBOL_DUMMY;
   res->is_external = FALSE;
@@ -111,7 +108,7 @@ gtk_constraint_variable_new_objective (const char *name)
 {
   GtkConstraintVariable *res = g_rc_box_new (GtkConstraintVariable);
 
-  gtk_constraint_variable_init (res, NULL, name);
+  gtk_constraint_variable_init (res, name);
 
   res->_type = GTK_CONSTRAINT_SYMBOL_OBJECTIVE;
   res->is_external = FALSE;
@@ -148,7 +145,7 @@ gtk_constraint_variable_new_slack (const char *name)
 {
   GtkConstraintVariable *res = g_rc_box_new (GtkConstraintVariable);
 
-  gtk_constraint_variable_init (res, NULL, name);
+  gtk_constraint_variable_init (res, name);
 
   res->_type = GTK_CONSTRAINT_SYMBOL_SLACK;
   res->is_external = FALSE;
@@ -160,8 +157,7 @@ gtk_constraint_variable_new_slack (const char *name)
 
 /*< private >
  * gtk_constraint_variable_new:
- * @prefix: (nullable): an optional prefix string for @name
- * @name: (nullable): an optional name for the variable
+ * @name: the name of the variable
  *
  * Allocates and initializes a new #GtkConstraintVariable for a regular
  * symbol. All variables introduced by constraints are regular variables.
@@ -174,12 +170,11 @@ gtk_constraint_variable_new_slack (const char *name)
  * Returns: a newly allocated #GtkConstraintVariable
  */
 GtkConstraintVariable *
-gtk_constraint_variable_new (const char *prefix,
-                             const char *name)
+gtk_constraint_variable_new (const char *name)
 {
   GtkConstraintVariable *res = g_rc_box_new (GtkConstraintVariable);
 
-  gtk_constraint_variable_init (res, prefix, name);
+  gtk_constraint_variable_init (res, name);
 
   res->_type = GTK_CONSTRAINT_SYMBOL_REGULAR;
   res->is_external = TRUE;
@@ -189,6 +184,24 @@ gtk_constraint_variable_new (const char *prefix,
   return res;
 }
 
+/*< private >
+ * gtk_constraint_variable_set_prefix:
+ * @variable: a #GtkConstraintVariable
+ * @prefix: a prefix string
+ *
+ * Sets the prefix to the @variable's name.
+ *
+ * This function is useful when debugging the variable contents.
+ */
+void
+gtk_constraint_variable_set_prefix (GtkConstraintVariable *variable,
+                                    const char *prefix)
+{
+  g_return_if_fail (variable != NULL);
+
+  variable->prefix = g_intern_string (prefix);
+}
+
 /*< private >
  * gtk_constraint_variable_ref:
  * @variable: a #GtkConstraintVariable

gtk/gtkconstraintexpressionprivate.h

@@ -26,8 +26,7 @@
 G_BEGIN_DECLS
 
 GtkConstraintVariable *
-gtk_constraint_variable_new (const char *prefix,
-                             const char *name);
+gtk_constraint_variable_new (const char *name);
 
 GtkConstraintVariable *
 gtk_constraint_variable_new_dummy (const char *name);
@@ -51,6 +50,10 @@ gtk_constraint_variable_set_value (GtkConstraintVariable *variable,
 double
 gtk_constraint_variable_get_value (const GtkConstraintVariable *variable);
 
+void
+gtk_constraint_variable_set_prefix (GtkConstraintVariable *variable,
+                                    const char *prefix);
+
 char *
 gtk_constraint_variable_to_string (const GtkConstraintVariable *variable);
 

gtk/gtkconstraintlayout.c

@@ -64,10 +64,9 @@
 #include "gtkconstraintprivate.h"
 #include "gtkconstraintexpressionprivate.h"
 #include "gtkconstraintsolverprivate.h"
-#include "gtkconstraintvflparserprivate.h"
+#include "gtklayoutchild.h"
 
 #include "gtkdebug.h"
-#include "gtklayoutchild.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
@@ -1278,7 +1277,6 @@ update_min_width (GtkConstraintGuide *guide)
                                           GTK_CONSTRAINT_RELATION_GE,
                                           gtk_constraint_expression_new (guide->min_width),
                                           GTK_CONSTRAINT_WEIGHT_REQUIRED);
-  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (guide->layout));
 }
 
 static void
@@ -1305,7 +1303,6 @@ update_min_height (GtkConstraintGuide *guide)
                                           GTK_CONSTRAINT_RELATION_GE,
                                           gtk_constraint_expression_new (guide->min_height),
                                           GTK_CONSTRAINT_WEIGHT_REQUIRED);
-  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (guide->layout));
 }
 
 static void
@@ -1332,7 +1329,6 @@ update_nat_width (GtkConstraintGuide *guide)
                                           GTK_CONSTRAINT_RELATION_EQ,
                                           gtk_constraint_expression_new (guide->nat_width),
                                           GTK_CONSTRAINT_WEIGHT_MEDIUM);
-  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (guide->layout));
 }
 
 static void
@@ -1359,7 +1355,6 @@ update_nat_height (GtkConstraintGuide *guide)
                                           GTK_CONSTRAINT_RELATION_EQ,
                                           gtk_constraint_expression_new (guide->nat_height),
                                           GTK_CONSTRAINT_WEIGHT_MEDIUM);
-  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (guide->layout));
 }
 
 static void
@@ -1590,323 +1585,3 @@ gtk_constraint_layout_remove_guide (GtkConstraintLayout *layout,
 
   gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (layout));
 }
-
-static GtkConstraintAttribute
-attribute_from_name (const char *name)
-{
-  if (name == NULL || *name == '\0')
-    return GTK_CONSTRAINT_ATTRIBUTE_NONE;
-
-  /* We sadly need to special case these two because the name does
-   * not match the VFL grammar rules
-   */
-  if (strcmp (name, "centerX") == 0)
-    return GTK_CONSTRAINT_ATTRIBUTE_CENTER_X;
-
-  if (strcmp (name, "centerY") == 0)
-    return GTK_CONSTRAINT_ATTRIBUTE_CENTER_Y;
-
-  for (int i = 0; i < G_N_ELEMENTS (attribute_names); i++)
-    {
-      if (strcmp (attribute_names[i], name) == 0)
-        return i;
-    }
-
-  return GTK_CONSTRAINT_ATTRIBUTE_NONE;
-}
-
-/**
- * gtk_constraint_layout_add_constraints_from_descriptionv: (rename-to gtk_constraint_layout_add_constraints_from_description)
- * @layout: a #GtkConstraintLayout
- * @lines: (array length=n_lines): an array of Visual Format Language lines
- *   defining a set of constraints
- * @n_lines: the number of lines
- * @hspacing: default horizontal spacing value, or -1 for the fallback value
- * @vspacing: default vertical spacing value, or -1 for the fallback value
- * @views: (element-type utf8 Gtk.Widget): a dictionary of [ name, widget ]
- *   pairs; the `name` keys map to the view names in the VFL lines, while
- *   the `widget` values map to children of the widget using a #GtkConstraintLayout
- * @error: return location for a #GError
- *
- * Creates a list of constraints they formal description using a compact
- * description syntax called VFL, or "Visual Format Language".
- *
- * The Visual Format Language is based on Apple's AutoLayout [VFL](https://developer.apple.com/library/content/documentation/UserExperience/Conceptual/AutolayoutPG/VisualFormatLanguage.html).
- *
- * The @views dictionary is used to match #GtkConstraintTargets to the symbolic
- * view name inside the VFL.
- *
- * The VFL grammar is:
- *
- * |[<!-- language="plain" -->
- *        <visualFormatString> = (<orientation>)?
- *                               (<superview><connection>)?
- *                               <view>(<connection><view>)*
- *                               (<connection><superview>)?
- *               <orientation> = 'H' | 'V'
- *                 <superview> = '|'
- *                <connection> = '' | '-' <predicateList> '-' | '-'
- *             <predicateList> = <simplePredicate> | <predicateListWithParens>
- *           <simplePredicate> = <metricName> | <positiveNumber>
- *   <predicateListWithParens> = '(' <predicate> (',' <predicate>)* ')'
- *                 <predicate> = (<relation>)? <objectOfPredicate> (<operatorList>)? ('@' <priority>)?
- *                  <relation> = '==' | '<=' | '>='
- *         <objectOfPredicate> = <constant> | <viewName> | ('.' <attributeName>)?
- *                  <priority> = <positiveNumber> | 'required' | 'strong' | 'medium' | 'weak'
- *                  <constant> = <number>
- *              <operatorList> = (<multiplyOperator>)? (<addOperator>)?
- *          <multiplyOperator> = [ '*' | '/' ] <positiveNumber>
- *               <addOperator> = [ '+' | '-' ] <positiveNumber>
- *                  <viewName> = [A-Za-z_]([A-Za-z0-9_]*) // A C identifier
- *                <metricName> = [A-Za-z_]([A-Za-z0-9_]*) // A C identifier
- *             <attributeName> = 'top' | 'bottom' | 'left' | 'right' | 'width' | 'height' |
- *                               'start' | 'end' | 'centerX' | 'centerY' | 'baseline'
- *            <positiveNumber> // A positive real number parseable by g_ascii_strtod()
- *                    <number> // A real number parseable by g_ascii_strtod()
- * ]|
- *
- * **Note**: The VFL grammar used by GTK is slightly different than the one
- * defined by Apple, as it can use symbolic values for the constraint's
- * strength instead of numeric values; additionally, GTK allows adding
- * simple arithmetic operations inside predicates.
- *
- * Examples of VFL descriptions are:
- *
- * |[<!-- language="plain" -->
- *   // Default spacing
- *   [button]-[textField]
- *
- *   // Width constraint
- *   [button(>=50)]
- *
- *   // Connection to super view
- *   |-50-[purpleBox]-50-|
- *
- *   // Vertical layout
- *   V:[topField]-10-[bottomField]
- *
- *   // Flush views
- *   [maroonView][blueView]
- *
- *   // Priority
- *   [button(100@strong)]
- *
- *   // Equal widths
- *   [button1(==button2)]
- *
- *   // Multiple predicates
- *   [flexibleButton(>=70,<=100)]
- *
- *   // A complete line of layout
- *   |-[find]-[findNext]-[findField(>=20)]-|
- *
- *   // Operators
- *   [button1(button2 / 3 + 50)]
- *
- *   // Named attributes
- *   [button1(==button2.height)]
- * ]|
- *
- * Returns: %TRUE if the constraints were added to the layout
- */
-gboolean
-gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *layout,
-                                                         const char * const   lines[],
-                                                         gsize                n_lines,
-                                                         int                  hspacing,
-                                                         int                  vspacing,
-                                                         GHashTable          *views,
-                                                         GError             **error)
-{
-  GtkConstraintVflParser *parser;
-
-  g_return_val_if_fail (GTK_IS_CONSTRAINT_LAYOUT (layout), FALSE);
-  g_return_val_if_fail (lines != NULL, FALSE);
-  g_return_val_if_fail (views != NULL, FALSE);
-  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-  parser = gtk_constraint_vfl_parser_new ();
-  gtk_constraint_vfl_parser_set_default_spacing (parser, hspacing, vspacing);
-  gtk_constraint_vfl_parser_set_views (parser, views);
-
-  for (gsize i = 0; i < n_lines; i++)
-    {
-      const char *line = lines[i];
-      GError *internal_error = NULL;
-
-      gtk_constraint_vfl_parser_parse_line (parser, line, -1, &internal_error);
-      if (internal_error != NULL)
-        {
-          int offset = gtk_constraint_vfl_parser_get_error_offset (parser);
-          int range = gtk_constraint_vfl_parser_get_error_range (parser);
-          char *squiggly = NULL;
-
-          if (range > 0)
-            {
-              squiggly = g_new (char, range + 1);
-
-              for (int r = 0; r < range; i++)
-                squiggly[r] = '~';
-
-              squiggly[range] = '\0';
-            }
-
-          g_set_error (error, GTK_CONSTRAINT_VFL_PARSER_ERROR,
-                       internal_error->code,
-                       "%" G_GSIZE_FORMAT ":%d: %s\n"
-                       "%s\n"
-                       "%*s^%s",
-                       i, offset + 1,
-                       internal_error->message,
-                       line,
-                       offset, " ", squiggly != NULL ? squiggly : "");
-
-          g_free (squiggly);
-          g_error_free (internal_error);
-          gtk_constraint_vfl_parser_free (parser);
-          return FALSE;
-        }
-
-      int n_constraints = 0;
-      GtkConstraintVfl *constraints = gtk_constraint_vfl_parser_get_constraints (parser, &n_constraints);
-      for (int j = 0; j < n_constraints; j++)
-        {
-          const GtkConstraintVfl *c = &constraints[j];
-          gpointer source, target;
-          GtkConstraintAttribute source_attr, target_attr;
-
-          target = g_hash_table_lookup (views, c->view1);
-          target_attr = attribute_from_name (c->attr1);
-
-          if (c->view2 != NULL)
-            source = g_hash_table_lookup (views, c->view2);
-          else
-            source = NULL;
-
-          if (c->attr2 != NULL)
-            source_attr = attribute_from_name (c->attr2);
-          else
-            source_attr = GTK_CONSTRAINT_ATTRIBUTE_NONE;
-
-          GtkConstraint *constraint =
-            gtk_constraint_new (target, target_attr,
-                                c->relation,
-                                source, source_attr,
-                                c->multiplier,
-                                c->constant,
-                                c->strength);
-
-          layout_add_constraint (layout, constraint);
-          g_hash_table_add (layout->constraints, constraint);
-        }
-
-      g_free (constraints);
-    }
-
-  gtk_constraint_vfl_parser_free (parser);
-
-  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (layout));
-
-  return TRUE;
-}
-
-/**
- * gtk_constraint_layout_add_constraints_from_description:
- * @layout: a #GtkConstraintLayout
- * @lines: (array length=n_lines): an array of Visual Format Language lines
- *   defining a set of constraints
- * @n_lines: the number of lines
- * @hspacing: default horizontal spacing value, or -1 for the fallback value
- * @vspacing: default vertical spacing value, or -1 for the fallback value
- * @error: return location for a #GError
- * @first_view: the name of a view in the VFL description, followed by the
- *   #GtkConstraintTarget to which it maps
- * @...: a %NULL-terminated list of view names and #GtkConstraintTargets
- *
- * Creates a list of constraints they formal description using a compact
- * description syntax called VFL, or "Visual Format Language".
- *
- * This function is a convenience wrapper around
- * gtk_constraint_layout_add_constraints_from_descriptionv(), using
- * variadic arguments to populate the view/target map.
- *
- * Returns: %TRUE if the constraints were added to the layout
- */
-gboolean
-gtk_constraint_layout_add_constraints_from_description (GtkConstraintLayout *layout,
-                                                        const char * const   lines[],
-                                                        gsize                n_lines,
-                                                        int                  hspacing,
-                                                        int                  vspacing,
-                                                        GError             **error,
-                                                        const char          *first_view,
-                                                        ...)
-{
-  GtkConstraintVflParser *parser;
-  GHashTable *views;
-  const char *view;
-  gboolean res;
-  va_list args;
-
-  g_return_val_if_fail (GTK_IS_CONSTRAINT_LAYOUT (layout), FALSE);
-  g_return_val_if_fail (lines != NULL, FALSE);
-  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-  g_return_val_if_fail (first_view != NULL, FALSE);
-
-  parser = gtk_constraint_vfl_parser_new ();
-  gtk_constraint_vfl_parser_set_default_spacing (parser, hspacing, vspacing);
-
-  views = g_hash_table_new (g_str_hash, g_str_equal);
-
-  va_start (args, first_view);
-
-  view = first_view;
-  while (view != NULL)
-    {
-      GtkConstraintTarget *target = va_arg (args, GtkConstraintTarget *);
-
-      if (target == NULL)
-        break;
-
-      g_hash_table_insert (views, (gpointer) view, target);
-
-      view = va_arg (args, const char *);
-    }
-
-  va_end (args);
-
-  res =
-    gtk_constraint_layout_add_constraints_from_descriptionv (layout, lines, n_lines,
-                                                             hspacing, vspacing,
-                                                             views,
-                                                             error);
-
-  g_hash_table_unref (views);
-
-  return res;
-}
-
-/**
- * gtk_constraint_layout_remove_all_constraints:
- * @manager: a #GtkConstraintLayout
- *
- * Removes all constraints from @manager.
- */
-void
-gtk_constraint_layout_remove_all_constraints (GtkConstraintLayout *manager)
-{
-  GHashTableIter iter;
-  gpointer key;
-
-  g_return_if_fail (GTK_IS_CONSTRAINT_LAYOUT (manager));
-
-  g_hash_table_iter_init (&iter, manager->constraints);
-  while (g_hash_table_iter_next (&iter, &key, NULL))
-    {
-      GtkConstraint *constraint = key;
-      gtk_constraint_detach (constraint);
-      g_hash_table_iter_remove (&iter);
-    }
-
-  gtk_layout_manager_layout_changed (GTK_LAYOUT_MANAGER (manager));
-}

gtk/gtkconstraintlayout.h

@@ -76,25 +76,4 @@ GDK_AVAILABLE_IN_ALL
 void                    gtk_constraint_layout_remove_guide      (GtkConstraintLayout *manager,
                                                                  GtkConstraintGuide  *guide);
 
-GDK_AVAILABLE_IN_ALL
-gboolean                gtk_constraint_layout_add_constraints_from_description  (GtkConstraintLayout *manager,
-                                                                                 const char * const   lines[],
-                                                                                 gsize                n_lines,
-                                                                                 int                  hspacing,
-                                                                                 int                  vspacing,
-                                                                                 GError             **error,
-                                                                                 const char          *first_view,
-                                                                                 ...) G_GNUC_NULL_TERMINATED;
-GDK_AVAILABLE_IN_ALL
-gboolean                gtk_constraint_layout_add_constraints_from_descriptionv (GtkConstraintLayout *manager,
-                                                                                 const char * const   lines[],
-                                                                                 gsize                n_lines,
-                                                                                 int                  hspacing,
-                                                                                 int                  vspacing,
-                                                                                 GHashTable          *views,
-                                                                                 GError             **error);
-
-GDK_AVAILABLE_IN_ALL
-void                    gtk_constraint_layout_remove_all_constraints (GtkConstraintLayout *manager);
-
 G_END_DECLS

gtk/gtkconstraintsolver.c

@@ -1482,7 +1482,8 @@ gtk_constraint_solver_create_variable (GtkConstraintSolver *self,
 {
   GtkConstraintVariable *res;
 
-  res = gtk_constraint_variable_new (prefix, name);
+  res = gtk_constraint_variable_new (name);
+  gtk_constraint_variable_set_prefix (res, prefix);
   gtk_constraint_variable_set_value (res, value);
 
   return res;
@@ -1971,6 +1972,7 @@ gtk_constraint_solver_suggest_value (GtkConstraintSolver *self,
                                      double value)
 {
   EditInfo *ei = g_hash_table_lookup (self->edit_var_map, variable);
+  double delta;
   if (ei == NULL)
     {
       g_critical ("Suggesting value '%g' but variable %p is not editable",
@@ -1986,9 +1988,10 @@ gtk_constraint_solver_suggest_value (GtkConstraintSolver *self,
       return;
     }
 
-  ei->prev_constant = value - ei->prev_constant;
+  delta = value - ei->prev_constant;
+  ei->prev_constant = value;
 
-  gtk_constraint_solver_delta_edit_constant (self, ei->prev_constant, ei->eplus, ei->eminus);
+  gtk_constraint_solver_delta_edit_constant (self, delta, ei->eplus, ei->eminus);
 }
 
 /*< private >

gtk/gtkconstraintvflparserprivate.h

@@ -1,89 +0,0 @@
-/* gtkconstraintvflparserprivate.h: VFL constraint definition parser 
- *
- * Copyright 2017  Endless
- * Copyright 2019  GNOME Foundation
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 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
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "gtkconstrainttypesprivate.h"
-
-G_BEGIN_DECLS
-
-#define GTK_CONSTRAINT_VFL_PARSER_ERROR (gtk_constraint_vfl_parser_error_quark ())
-
-typedef enum {
-  GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_SYMBOL,
-  GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_ATTRIBUTE,
-  GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_VIEW,
-  GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_METRIC,
-  GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_PRIORITY,
-  GTK_CONSTRAINT_VFL_PARSER_ERROR_INVALID_RELATION
-} VflError;
-
-typedef struct _GtkConstraintVflParser       GtkConstraintVflParser;
-
-typedef struct {
-  const char *view1;
-  const char *attr1;
-  GtkConstraintRelation relation;
-  const char *view2;
-  const char *attr2;
-  double constant;
-  double multiplier;
-  double strength;
-} GtkConstraintVfl;
-
-GQuark gtk_constraint_vfl_parser_error_quark (void);
-
-GtkConstraintVflParser *
-gtk_constraint_vfl_parser_new (void);
-
-void
-gtk_constraint_vfl_parser_free (GtkConstraintVflParser *parser);
-
-void
-gtk_constraint_vfl_parser_set_default_spacing (GtkConstraintVflParser *parser,
-                                               int hspacing,
-                                               int vspacing);
-
-void
-gtk_constraint_vfl_parser_set_metrics (GtkConstraintVflParser *parser,
-                                       GHashTable *metrics);
-
-void
-gtk_constraint_vfl_parser_set_views (GtkConstraintVflParser *parser,
-                                     GHashTable *views);
-
-gboolean
-gtk_constraint_vfl_parser_parse_line (GtkConstraintVflParser *parser,
-                                      const char *line,
-                                      gssize len,
-                                      GError **error);
-
-int
-gtk_constraint_vfl_parser_get_error_offset (GtkConstraintVflParser *parser);
-
-int
-gtk_constraint_vfl_parser_get_error_range (GtkConstraintVflParser *parser);
-
-GtkConstraintVfl *
-gtk_constraint_vfl_parser_get_constraints (GtkConstraintVflParser *parser,
-                                           int *n_constraints);
-
-G_END_DECLS

gtk/meson.build

@@ -39,7 +39,6 @@ gtk_private_sources = files([
   'gtkcolorswatch.c',
   'gtkconstraintexpression.c',
   'gtkconstraintsolver.c',
-  'gtkconstraintvflparser.c',
   'gtkcssanimatedstyle.c',
   'gtkcssanimation.c',
   'gtkcssarrayvalue.c',

testsuite/gtk/constraint-solver.c

@@ -254,15 +254,27 @@ constraint_solver_edit_var_suggest (void)
   gtk_constraint_solver_suggest_value (solver, a, 2.0);
   gtk_constraint_solver_resolve (solver);
 
+  g_test_message ("Check values after first edit");
+
   g_assert_cmpfloat_with_epsilon (gtk_constraint_variable_get_value (a), 2.0, 0.001);
   g_assert_cmpfloat_with_epsilon (gtk_constraint_variable_get_value (b), 2.0, 0.001);
 
   gtk_constraint_solver_suggest_value (solver, a, 10.0);
   gtk_constraint_solver_resolve (solver);
 
+  g_test_message ("Check values after second edit");
+
   g_assert_cmpfloat_with_epsilon (gtk_constraint_variable_get_value (a), 10.0, 0.001);
   g_assert_cmpfloat_with_epsilon (gtk_constraint_variable_get_value (b), 10.0, 0.001);
 
+  gtk_constraint_solver_suggest_value (solver, a, 12.0);
+  gtk_constraint_solver_resolve (solver);
+
+  g_test_message ("Check values after third edit");
+
+  g_assert_cmpfloat_with_epsilon (gtk_constraint_variable_get_value (a), 12.0, 0.001);
+  g_assert_cmpfloat_with_epsilon (gtk_constraint_variable_get_value (b), 12.0, 0.001);
+
   gtk_constraint_variable_unref (a);
   gtk_constraint_variable_unref (b);