[gegl] bin: do not hardcode images from HighContrast theme
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gegl] bin: do not hardcode images from HighContrast theme
- Date: Fri, 1 Mar 2019 13:39:22 +0000 (UTC)
commit 75db50c77eb93ce23222b86caf93140b484b5900
Author: Øyvind Kolås <pippin gimp org>
Date: Fri Mar 1 14:29:50 2019 +0100
bin: do not hardcode images from HighContrast theme
Use some placeholder simple filled cairo shapes instead.
bin/ui-collection.c | 30 ++++++++++++++++++++++++++++
configure.ac | 2 +-
docs/NEWS.txt | 17 +++++++++++++---
tests/compositions/reference/lens-flare.png | Bin 456322 -> 385803 bytes
4 files changed, 45 insertions(+), 4 deletions(-)
---
diff --git a/bin/ui-collection.c b/bin/ui-collection.c
index c6100030e..f213c2736 100644
--- a/bin/ui-collection.c
+++ b/bin/ui-collection.c
@@ -46,6 +46,24 @@ static void update_grid_dim (GeState *o)
hack_cols = mrg_width (o->mrg) / hack_dim;
}
+static void draw_left_triangle (Mrg *mrg, float x, float y, float w, float h)
+{
+ cairo_t *cr = mrg_cr (mrg);
+ cairo_new_path (cr);
+ cairo_new_path (cr);
+ cairo_move_to (cr, x+0.9*w, y+0.1*h);
+ cairo_line_to (cr, x+0.9*w, y+0.9*h);
+ cairo_line_to (cr, x+0.1*w, y+0.5*h);
+}
+
+static void draw_folder (Mrg *mrg, float x, float y, float w, float h)
+{
+ cairo_t *cr = mrg_cr (mrg);
+ cairo_new_path (cr);
+ cairo_rectangle (cr, 0.00 *w + x, 0.00 * h + y, 0.33 * w, 0.10 * h);
+ cairo_rectangle (cr, 0.00 *w + x, 0.10 * h + y, 0.66 * w, 0.66 * h);
+}
+
static void on_viewer_motion (MrgEvent *e, void *data1, void *data2)
{
@@ -273,9 +291,15 @@ void ui_collection (GeState *o)
}
mrg_listen_full (mrg, MRG_CLICK, ui_run_command, "parent", NULL, NULL, NULL);
+ draw_left_triangle (mrg, x + (dim-wdim)/2 + dim * padding, y + (dim-hdim)/2 + dim * padding,
+ wdim * (1.0-padding*2), hdim *(1.0-padding*2));
+ cairo_set_source_rgba (mrg_cr (mrg), 1,1,1,.5);
+ cairo_fill (mrg_cr (mrg));
+#if 0
mrg_image (mrg, x + (dim-wdim)/2 + dim * padding, y + (dim-hdim)/2 + dim * padding,
wdim * (1.0-padding*2), hdim *(1.0-padding*2), 1.0,
"/usr/share/icons/HighContrast/256x256/actions/go-up.png", NULL, NULL);
+#endif
cairo_new_path (mrg_cr(mrg));
mrg_set_xy (mrg, x, y + dim - mrg_em(mrg) * 2);
@@ -311,9 +335,15 @@ void ui_collection (GeState *o)
cairo_fill (mrg_cr (mrg));
}
+ draw_folder (mrg, x + (dim-wdim)/2 + dim * padding, y + (dim-hdim)/2 + dim * padding,
+ wdim * (1.0-padding*2), hdim *(1.0-padding*2));
+ cairo_set_source_rgba (mrg_cr (mrg), 1,1,1,.5);
+ cairo_fill (mrg_cr (mrg));
+#if 0
mrg_image (mrg, x + (dim-wdim)/2 + dim * padding, y + (dim-hdim)/2 + dim * padding,
wdim * (1.0-padding*2), hdim *(1.0-padding*2), 1.0,
"/usr/share/icons/HighContrast/256x256/places/folder.png", NULL, NULL);
+#endif
is_dir = 1;
}
diff --git a/configure.ac b/configure.ac
index 1a51c1a1f..f886d53fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@ dnl set GEGL_BINARY_AGE _and_ GEGL_INTERFACE_AGE to 0.
m4_define([gegl_major_version], [0])
m4_define([gegl_minor_version], [4])
-m4_define([gegl_micro_version], [13])
+m4_define([gegl_micro_version], [14])
m4_define([gegl_real_version],
[gegl_major_version.gegl_minor_version.gegl_micro_version])
m4_define([gegl_version], [gegl_real_version])
diff --git a/docs/NEWS.txt b/docs/NEWS.txt
index e4929c833..bd1ebeb2f 100644
--- a/docs/NEWS.txt
+++ b/docs/NEWS.txt
@@ -1,4 +1,4 @@
-GEGL-0.4.14 2019-03-xx
+GEGL-0.4.14 2019-03-01
----------------------
Core
@@ -74,8 +74,9 @@ graph/property editor has been added, and migration/extension to lua has begun
for parts of the code.
WARNING: many parts of the UI is of exploratory proof of concept/alpha quality
-but released since it is part of the GEGL repository and useful development
-tools both for creating and testing new GEGL operations as well as GEGL itself.
+but are released since the code is part of the GEGL repository and important
+development tools both for creating and testing new GEGL operations as well as
+GEGL itself.
Some screenshots showing some the process towards the state and capabilties of
the UI in this release can be seen at https://www.patreon.com/posts/24123574
@@ -112,6 +113,16 @@ Ray, elad, Ell, Jehan, Marco Ciampa, Michael Natterer, Øyvind Kolås, Piotr
Drąg, Richard B. Kreckel, Rodrigo Lledó, sabri ünal, thetoastcaper, Thomas
Manni and woob.
+This release depends on the new features of babl-0.1.62 which has the following
+change summary for the last release:
+
+Continuous integration with gitlab.
+Initial CMYK spaces with lcms2 based ICC support, much room for optimization.
+Improved custom space support for palette formats.
+scRGB space, works like sRGB but always with linear TRCs.
+Model introspection API permitting low overhead checks whether a format/model
+is RGB, CMYK type of alpha and similar.
+
GEGL-0.4.12 2018-10-23
----------------------
diff --git a/tests/compositions/reference/lens-flare.png b/tests/compositions/reference/lens-flare.png
index 5c7d83ad7..66487a3cf 100644
Binary files a/tests/compositions/reference/lens-flare.png and b/tests/compositions/reference/lens-flare.png
differ
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]