[metacity] libmetacity: don't expose MetaGradientSpec
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] libmetacity: don't expose MetaGradientSpec
- Date: Sun, 7 Feb 2016 21:47:07 +0000 (UTC)
commit 3c566b2cb01ea3703aea216959f870b0269a6878
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Sun Feb 7 23:11:44 2016 +0200
libmetacity: don't expose MetaGradientSpec
libmetacity/Makefile.am | 5 +--
libmetacity/meta-draw-op-private.h | 2 +-
libmetacity/meta-gradient-private.h | 18 +++++++-
...radient-spec.h => meta-gradient-spec-private.h} | 19 +++++++-
libmetacity/meta-gradient-spec.c | 2 +-
libmetacity/meta-gradient.h | 44 --------------------
src/ui/testgradient.c | 1 -
7 files changed, 35 insertions(+), 56 deletions(-)
---
diff --git a/libmetacity/Makefile.am b/libmetacity/Makefile.am
index de818ee..8975d23 100644
--- a/libmetacity/Makefile.am
+++ b/libmetacity/Makefile.am
@@ -25,10 +25,9 @@ libmetacity_la_SOURCES = \
meta-frame-style.c \
meta-frame-style.h \
meta-gradient.c \
- meta-gradient.h \
meta-gradient-private.h \
meta-gradient-spec.c \
- meta-gradient-spec.h \
+ meta-gradient-spec-private.h \
meta-hsla.c \
meta-hsla-private.h \
meta-style-info.c \
@@ -78,8 +77,6 @@ libmetacity_include_HEADERS = \
meta-frame-enums.h \
meta-frame-layout.h \
meta-frame-style.h \
- meta-gradient.h \
- meta-gradient-spec.h \
meta-theme.h \
$(NULL)
diff --git a/libmetacity/meta-draw-op-private.h b/libmetacity/meta-draw-op-private.h
index 2cc4f1a..ad3260d 100644
--- a/libmetacity/meta-draw-op-private.h
+++ b/libmetacity/meta-draw-op-private.h
@@ -24,7 +24,7 @@
#include "meta-color-spec.h"
#include "meta-draw-spec.h"
#include "meta-frame-borders.h"
-#include "meta-gradient-spec.h"
+#include "meta-gradient-spec-private.h"
G_BEGIN_DECLS
diff --git a/libmetacity/meta-gradient-private.h b/libmetacity/meta-gradient-private.h
index e460bdd..99ee64e 100644
--- a/libmetacity/meta-gradient-private.h
+++ b/libmetacity/meta-gradient-private.h
@@ -22,10 +22,24 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk/gdk.h>
-#include "meta-gradient.h"
-
G_BEGIN_DECLS
+/**
+ * MetaGradientType:
+ * @META_GRADIENT_VERTICAL: Vertical gradient
+ * @META_GRADIENT_HORIZONTAL: Horizontal gradient
+ * @META_GRADIENT_DIAGONAL: Diagonal gradient
+ * @META_GRADIENT_LAST: Marks the end of the #MetaGradientType enumeration
+ *
+ */
+typedef enum
+{
+ META_GRADIENT_VERTICAL,
+ META_GRADIENT_HORIZONTAL,
+ META_GRADIENT_DIAGONAL,
+ META_GRADIENT_LAST
+} MetaGradientType;
+
G_GNUC_INTERNAL
GdkPixbuf *meta_gradient_create_simple (int width,
int height,
diff --git a/libmetacity/meta-gradient-spec.h b/libmetacity/meta-gradient-spec-private.h
similarity index 91%
rename from libmetacity/meta-gradient-spec.h
rename to libmetacity/meta-gradient-spec-private.h
index bae2d7e..e131214 100644
--- a/libmetacity/meta-gradient-spec.h
+++ b/libmetacity/meta-gradient-spec-private.h
@@ -16,50 +16,63 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef META_GRADIENT_SPEC_H
-#define META_GRADIENT_SPEC_H
+#ifndef META_GRADIENT_SPEC_PRIVATE_H
+#define META_GRADIENT_SPEC_PRIVATE_H
#include <gtk/gtk.h>
-#include <libmetacity/meta-gradient.h>
+
+#include "meta-gradient-private.h"
G_BEGIN_DECLS
typedef struct _MetaAlphaGradientSpec MetaAlphaGradientSpec;
typedef struct _MetaGradientSpec MetaGradientSpec;
+G_GNUC_INTERNAL
MetaGradientSpec *meta_gradient_spec_new (MetaGradientType type);
+G_GNUC_INTERNAL
void meta_gradient_spec_free (MetaGradientSpec *spec);
+G_GNUC_INTERNAL
void meta_gradient_spec_add_color_spec (MetaGradientSpec *spec,
MetaColorSpec *color_spec);
+G_GNUC_INTERNAL
GdkPixbuf *meta_gradient_spec_render (const MetaGradientSpec *spec,
GtkStyleContext *context,
gint width,
gint height);
+G_GNUC_INTERNAL
gboolean meta_gradient_spec_validate (MetaGradientSpec *spec,
GError **error);
+G_GNUC_INTERNAL
MetaAlphaGradientSpec *meta_alpha_gradient_spec_new (MetaGradientType type,
gint n_alphas);
+G_GNUC_INTERNAL
void meta_alpha_gradient_spec_free (MetaAlphaGradientSpec *spec);
+G_GNUC_INTERNAL
void meta_alpha_gradient_spec_add_alpha (MetaAlphaGradientSpec *spec,
gint n_alpha,
gdouble alpha);
+G_GNUC_INTERNAL
guchar meta_alpha_gradient_spec_get_alpha (MetaAlphaGradientSpec *spec,
gint n_alpha);
+G_GNUC_INTERNAL
gboolean meta_alpha_gradient_spec_needs_alpha (MetaAlphaGradientSpec *spec);
+G_GNUC_INTERNAL
GdkPixbuf *meta_alpha_gradient_spec_apply_alpha (MetaAlphaGradientSpec *spec,
GdkPixbuf *pixbuf,
gboolean force_copy);
+G_GNUC_INTERNAL
GdkPixbuf *meta_alpha_gradient_spec_render (MetaAlphaGradientSpec *spec,
gint width,
gint height,
diff --git a/libmetacity/meta-gradient-spec.c b/libmetacity/meta-gradient-spec.c
index dcf974f..76c6ccd 100644
--- a/libmetacity/meta-gradient-spec.c
+++ b/libmetacity/meta-gradient-spec.c
@@ -22,7 +22,7 @@
#include "meta-color-spec.h"
#include "meta-gradient-private.h"
-#include "meta-gradient-spec.h"
+#include "meta-gradient-spec-private.h"
#include "meta-theme.h"
struct _MetaGradientSpec
diff --git a/src/ui/testgradient.c b/src/ui/testgradient.c
index 759775a..f2a6a6a 100644
--- a/src/ui/testgradient.c
+++ b/src/ui/testgradient.c
@@ -19,7 +19,6 @@
* along with this program; if not, see <http://www.gnu.org/licenses/>. */
#include <gtk/gtk.h>
-#include <libmetacity/meta-gradient.h>
#include <libmetacity/meta-gradient-private.h>
typedef void (* RenderGradientFunc) (cairo_t *cr,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]