[gedit] Drop theatrics and animated overlay and implement new floating slider
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gedit] Drop theatrics and animated overlay and implement new floating slider
- Date: Mon, 18 Feb 2013 07:21:52 +0000 (UTC)
commit 871648352beb8c10e22a99975154fc2a717a52de
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Sun Feb 17 14:17:14 2013 +0100
Drop theatrics and animated overlay and implement new floating slider
configure.ac | 1 -
gedit/Makefile.am | 9 -
gedit/gedit-animatable.c | 103 -----
gedit/gedit-animatable.h | 57 ---
gedit/gedit-animated-overlay.c | 172 ---------
gedit/gedit-animated-overlay.h | 64 ----
gedit/gedit-floating-slider.c | 396 --------------------
gedit/gedit-floating-slider.h | 67 ----
gedit/gedit-view-frame.c | 43 +--
gedit/theatrics/Makefile.am | 52 ---
gedit/theatrics/gedit-theatrics-actor.c | 279 --------------
gedit/theatrics/gedit-theatrics-actor.h | 90 -----
gedit/theatrics/gedit-theatrics-choreographer.c | 85 -----
gedit/theatrics/gedit-theatrics-choreographer.h | 74 ----
.../gedit-theatrics-enum-types.c.template | 39 --
.../gedit-theatrics-enum-types.h.template | 27 --
gedit/theatrics/gedit-theatrics-marshal.list | 1 -
gedit/theatrics/gedit-theatrics-stage.c | 310 ---------------
gedit/theatrics/gedit-theatrics-stage.h | 87 -----
gedit/theatrics/gedit-theatrics-utils.c | 131 -------
gedit/theatrics/gedit-theatrics-utils.h | 48 ---
libgd | 2 +-
tests/Makefile.am | 4 -
tests/test-overlay.c | 73 ----
24 files changed, 13 insertions(+), 2201 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 0290eeb..a4d7ea8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,7 +444,6 @@ data/org.gnome.gedit.gschema.xml.in
data/Makefile
docs/Makefile
docs/reference/Makefile
-gedit/theatrics/Makefile
gedit/Makefile
help/Makefile
libgd/Makefile
diff --git a/gedit/Makefile.am b/gedit/Makefile.am
index ff028d6..8574483 100644
--- a/gedit/Makefile.am
+++ b/gedit/Makefile.am
@@ -1,6 +1,4 @@
## Process this file with automake to produce Makefile.in
-SUBDIRS = theatrics
-
bin_PROGRAMS = gedit
noinst_LTLIBRARIES = libgedit.la
@@ -38,7 +36,6 @@ endif
libgedit_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
libgedit_la_LIBADD = \
- theatrics/libtheatrics.la \
$(top_builddir)/libgd/libgd.la
# GEDIT_LIBS must be the last to ensure correct order on some platforms
@@ -99,8 +96,6 @@ BUILT_SOURCES = \
gedit-marshal.h
NOINST_H_FILES = \
- gedit-animatable.h \
- gedit-animated-overlay.h \
gedit-cell-renderer-button.h \
gedit-close-button.h \
gedit-close-confirmation-dialog.h \
@@ -112,7 +107,6 @@ NOINST_H_FILES = \
gedit-documents-panel.h \
gedit-encodings-dialog.h \
gedit-file-chooser-dialog.h \
- gedit-floating-slider.h \
gedit-history-entry.h \
gedit-io-error-info-bar.h \
gedit-multi-notebook.h \
@@ -171,8 +165,6 @@ libgedit_private_la_SOURCES = \
gedit-resources.c
libgedit_c_files = \
- gedit-animatable.c \
- gedit-animated-overlay.c \
gedit-app.c \
gedit-cell-renderer-button.c \
gedit-close-button.c \
@@ -196,7 +188,6 @@ libgedit_c_files = \
gedit-encodings-combo-box.c \
gedit-encodings-dialog.c \
gedit-file-chooser-dialog.c \
- gedit-floating-slider.c \
gedit-history-entry.c \
gedit-io-error-info-bar.c \
gedit-message-bus.c \
diff --git a/gedit/gedit-view-frame.c b/gedit/gedit-view-frame.c
index 2b72967..4066059 100644
--- a/gedit/gedit-view-frame.c
+++ b/gedit/gedit-view-frame.c
@@ -28,8 +28,7 @@
#include "gedit-marshal.h"
#include "gedit-debug.h"
#include "gedit-utils.h"
-#include "gedit-animated-overlay.h"
-#include "gedit-floating-slider.h"
+#include <libgd/gd.h>
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
@@ -173,10 +172,7 @@ hide_search_widget (GeditViewFrame *frame,
frame->priv->typeselect_flush_timeout = 0;
}
- /* To hide the slider we just set the animation-state property */
- g_object_set (G_OBJECT (frame->priv->slider),
- "animation-state", GEDIT_THEATRICS_ANIMATION_STATE_INTENDING_TO_GO,
- NULL);
+ gd_revealer_set_reveal_child (GD_REVEALER (frame->priv->slider), FALSE);
if (cancel)
{
@@ -933,6 +929,7 @@ create_search_widget (GeditViewFrame *frame)
GtkStyleContext *context;
search_widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+ gtk_widget_set_name (search_widget, "gedit-search-slider");
context = gtk_widget_get_style_context (search_widget);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_LINKED);
@@ -1107,13 +1104,7 @@ start_interactive_search_real (GeditViewFrame *frame)
GtkTextIter iter;
GtkTextMark *mark;
- if (gtk_bin_get_child (GTK_BIN (frame->priv->slider)) == NULL)
- {
- gtk_container_add (GTK_CONTAINER (frame->priv->slider),
- create_search_widget (frame));
- }
-
- if (gtk_widget_get_visible (frame->priv->slider))
+ if (gd_revealer_get_reveal_child (GD_REVEALER (frame->priv->slider)))
{
if (frame->priv->search_mode != frame->priv->request_search_mode)
{
@@ -1161,10 +1152,7 @@ start_interactive_search_real (GeditViewFrame *frame)
frame->priv->start_mark = gtk_text_buffer_create_mark (buffer, NULL,
&iter, FALSE);
- /* To slide in we set the right animation state in the animatable */
- g_object_set (G_OBJECT (frame->priv->slider),
- "animation-state", GEDIT_THEATRICS_ANIMATION_STATE_COMING,
- NULL);
+ gd_revealer_set_reveal_child (GD_REVEALER (frame->priv->slider), TRUE);
/* NOTE: we must be very careful here to not have any text before
focusing the entry because when the entry is focused the text is
@@ -1263,16 +1251,13 @@ gedit_view_frame_init (GeditViewFrame *frame)
/* Create the scrolled window */
sw = gtk_scrolled_window_new (NULL, NULL);
-
gtk_container_add (GTK_CONTAINER (sw), frame->priv->view);
-
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
-
gtk_widget_show (sw);
- frame->priv->overlay = gedit_animated_overlay_new ();
+ frame->priv->overlay = gtk_overlay_new ();
gtk_container_add (GTK_CONTAINER (frame->priv->overlay), sw);
gtk_widget_override_background_color (frame->priv->overlay, 0, &transparent);
gtk_widget_show (frame->priv->overlay);
@@ -1280,8 +1265,10 @@ gedit_view_frame_init (GeditViewFrame *frame)
gtk_box_pack_start (GTK_BOX (frame), frame->priv->overlay, TRUE, TRUE, 0);
/* Add slider */
- frame->priv->slider = gedit_floating_slider_new ();
- gtk_widget_set_name (frame->priv->slider, "search-slider");
+ frame->priv->slider = gd_revealer_new ();
+ gtk_container_add (GTK_CONTAINER (frame->priv->slider),
+ create_search_widget (frame));
+ gtk_widget_show (frame->priv->slider);
gtk_widget_set_halign (frame->priv->slider, GTK_ALIGN_END);
gtk_widget_set_valign (frame->priv->slider, GTK_ALIGN_START);
@@ -1294,14 +1281,8 @@ gedit_view_frame_init (GeditViewFrame *frame)
gtk_widget_set_margin_left (frame->priv->slider, SEARCH_POPUP_MARGIN);
}
- g_object_set (G_OBJECT (frame->priv->slider),
- "easing", GEDIT_THEATRICS_CHOREOGRAPHER_EASING_EXPONENTIAL_IN_OUT,
- "blocking", GEDIT_THEATRICS_CHOREOGRAPHER_BLOCKING_DOWNSTAGE,
- "orientation", GTK_ORIENTATION_VERTICAL,
- NULL);
-
- gedit_animated_overlay_add_animated_overlay (GEDIT_ANIMATED_OVERLAY (frame->priv->overlay),
- GEDIT_ANIMATABLE (frame->priv->slider));
+ gtk_overlay_add_overlay (GTK_OVERLAY (frame->priv->overlay),
+ frame->priv->slider);
}
GeditViewFrame *
diff --git a/libgd b/libgd
index 25911b0..50c03b3 160000
--- a/libgd
+++ b/libgd
@@ -1 +1 @@
-Subproject commit 25911b0068b78cd425f0f405eae9b5654699dd2f
+Subproject commit 50c03b305321e027630f97aef17a74434d9b8980
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 58d452e..817bba1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -19,10 +19,6 @@ TEST_PROGS += document-saver
document_saver_SOURCES = document-saver.c
document_saver_LDADD = $(progs_ldadd)
-TEST_GTK_PROGS = test-overlay
-test_overlay_SOURCES = test-overlay.c
-test_overlay_LDADD = $(progs_ldadd)
-
TESTS = $(TEST_PROGS)
EXTRA_DIST = setup-document-saver.sh
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
