| blob | 19ac24ba4f6cc0639d6019758a4528e8f33336de |
1 Patch to current bazar version (r 151)
3 === added directory '.bzr-builddeb'
4 === added file '.bzr-builddeb/default.conf'
5 --- .bzr-builddeb/default.conf 1970-01-01 00:00:00 +0000
6 +++ .bzr-builddeb/default.conf 2016-01-19 12:14:18 +0000
7 @@ -0,0 +1,2 @@
8 +[BUILDDEB]
9 +split = True
11 === modified file 'Makefile.am'
12 --- Makefile.am 2011-05-19 13:32:42 +0000
13 +++ Makefile.am 2016-01-19 12:14:18 +0000
14 @@ -1,7 +1,6 @@
15 SUBDIRS = \
16 build \
17 - unico \
18 - tests
19 + unico
21 ACLOCAL_AMFLAGS = -I build
24 === modified file 'configure.ac'
25 --- configure.ac 2012-03-29 14:25:14 +0000
26 +++ configure.ac 2016-01-19 12:14:18 +0000
27 @@ -35,7 +35,7 @@
28 PKG_PROG_PKG_CONFIG
30 AC_SUBST(glib_req, 2.26.0)
31 -AC_SUBST(gtk_req, 3.3.14)
32 +AC_SUBST(gtk_req, 3.5.2)
33 AC_SUBST(cairo_req, 1.10)
35 PKG_CHECK_MODULES(DEPS, glib-2.0 >= $glib_req gtk+-3.0 >= $gtk_req cairo >= $cairo_req)
36 @@ -113,7 +113,6 @@
37 build/Makefile
38 po/Makefile
39 unico/Makefile
40 -tests/Makefile
41 ])
42 AC_OUTPUT
45 === added directory 'debian'
46 === added file 'debian/changelog'
47 --- debian/changelog 1970-01-01 00:00:00 +0000
48 +++ debian/changelog 2016-01-19 12:14:18 +0000
49 @@ -0,0 +1,173 @@
50 +unico (1.0.3+14.04.20140109-0ubuntu1) trusty; urgency=low
51 +
52 + [ Lars Uebernickel ]
53 + * Use outline attributes for focus to avoid custom attributes Custom
54 + attributes are deprecated, slow, and are causing problems with gtk
55 + 3.10. Adwaita is using the same hack for some time now [1]. This
56 + patch is a bit more hacky in that it hard codes the a fill color.
57 + [1] https://git.gnome.org/browse/gnome-themes-
58 + standard/commit/?id=6e641cf46cc70ce770482b3fc331b1fa3cd7af2b. (LP:
59 + #1018718)
60 +
61 + [ Ubuntu daily release ]
62 + * Automatic snapshot from revision 151
63 +
64 + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 09 Jan 2014 07:10:33 +0000
65 +
66 +unico (1.0.3daily13.05.30-0ubuntu1) saucy; urgency=low
67 +
68 + * Automatic snapshot from revision 149
69 +
70 + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Thu, 30 May 2013 00:24:13 +0000
71 +
72 +unico (1.0.3daily13.05.29ubuntu.unity.next-0ubuntu1) saucy; urgency=low
73 +
74 + * Automatic snapshot from revision 148 (ubuntu-unity/next)
75 +
76 + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Wed, 29 May 2013 16:55:39 +0000
77 +
78 +unico (1.0.3daily13.05.20ubuntu.unity.next-0ubuntu1) raring; urgency=low
79 +
80 + [ Łukasz 'sil2100' Zemczak ]
81 + * debian/control, debian/rules:
82 + - Modifications related to compliance with our packaging standards
83 + * Remove debian/watch
84 +
85 + [ Ubuntu daily release ]
86 + * Automatic snapshot from revision 147 (ubuntu-unity/next)
87 +
88 + -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Mon, 20 May 2013 00:01:18 +0000
89 +
90 +unico (1.0.3daily12.12.12-0ubuntu1) raring; urgency=low
91 +
92 + [ Mathieu Trudel-Lapierre ]
93 + * debian/control:
94 + - Update to use trailing commas at the end of lists to make it easier to
95 + add items to Build-Depends and Depends.
96 + - Reorganize Build-Depends for clarity, wrap gtk3-engines-unico Depends for
97 + the binary.
98 + - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders.
99 + - Add gnome-common to Build-Depends.
100 + - Renamed source package to unico to match the project name.
101 + * debian/rules:
102 + - Override dh_autoreconf to call autogen.sh and not run configure.
103 +
104 + [ Didier Roche ]
105 + * Automatic snapshot from revision 140 (bootstrap)
106 + * Fix licensing
107 + * Bump build-deps to match configure.ac
108 +
109 + [ Automatic PS uploader ]
110 + * Automatic snapshot from revision 145
111 +
112 + -- Automatic PS uploader <ps-jenkins@lists.canonical.com> Wed, 12 Dec 2012 00:01:01 +0000
113 +
114 +gtk3-engines-unico (1.0.2+r139-0ubuntu3) raring; urgency=low
115 +
116 + * Build for multiarch
117 + - debian/compat: Use compat level 9 to pass the MA dirs to the build
118 + system
119 + - debian/control: BD on debhelper (>= 9) for compat 9
120 + - debian/control: Mark package M-A: same
121 +
122 + -- Iain Lane <iain.lane@canonical.com> Mon, 12 Nov 2012 10:23:20 +0000
123 +
124 +gtk3-engines-unico (1.0.2+r139-0ubuntu2) quantal; urgency=low
125 +
126 + * debian/control
127 + - build depend on dh-autoreconf
128 +
129 + -- Ken VanDine <ken.vandine@canonical.com> Wed, 08 Aug 2012 14:57:10 -0400
130 +
131 +gtk3-engines-unico (1.0.2+r139-0ubuntu1) quantal; urgency=low
132 +
133 + * New snapshot from trunk
134 + * debian/control
135 + - bump standards to 3.9.3
136 +
137 + -- Ken VanDine <ken.vandine@canonical.com> Wed, 08 Aug 2012 14:47:34 -0400
138 +
139 +gtk3-engines-unico (1.0.2-0ubuntu2) quantal; urgency=low
140 +
141 + * Disable rounded corner code that crashes on quantal
142 +
143 + -- Robert Ancell <robert.ancell@canonical.com> Thu, 14 Jun 2012 17:40:10 +1200
144 +
145 +gtk3-engines-unico (1.0.2-0ubuntu1) precise; urgency=low
146 +
147 + * New upstream release.
148 + - Fixed a memory leak
149 +
150 + -- Ken VanDine <ken.vandine@canonical.com> Thu, 29 Mar 2012 15:01:51 -0400
151 +
152 +gtk3-engines-unico (1.0.1-0ubuntu5) precise; urgency=low
153 +
154 + * Backport upstream fixes for i386 look issues and valgrind errors
155 +
156 + -- Sebastien Bacher <seb128@ubuntu.com> Wed, 29 Feb 2012 21:28:29 +0100
157 +
158 +gtk3-engines-unico (1.0.1-0ubuntu4) precise; urgency=low
159 +
160 + * Backport upstream commit "Fixes for inconsistent state"
161 +
162 + -- Sebastien Bacher <seb128@ubuntu.com> Wed, 22 Feb 2012 21:31:52 +0100
163 +
164 +gtk3-engines-unico (1.0.1-0ubuntu3) precise; urgency=low
165 +
166 + * Backported r126, fixes gedit context menu issues (lp: #929138)
167 +
168 + -- Sebastien Bacher <seb128@ubuntu.com> Thu, 09 Feb 2012 17:18:24 +0100
169 +
170 +gtk3-engines-unico (1.0.1-0ubuntu2) precise; urgency=low
171 +
172 + * Backported r125, support correctly the new gtk (lp: #928712)
173 + * debian/control: updated gtk requirement
174 + * debian/source/format:
175 + - switch to format v1, bzr-builddeb doesn't like full source backports
176 + using the vcs with v3
177 +
178 + -- Sebastien Bacher <seb128@ubuntu.com> Wed, 08 Feb 2012 15:16:02 +0100
179 +
180 +gtk3-engines-unico (1.0.1-0ubuntu1) oneiric; urgency=low
181 +
182 + * New upstream release.
183 + - gtk_render_line doesn't work if y0 == y1 or x1 == x0 (LP: #833958)
184 +
185 + -- Ken VanDine <ken.vandine@canonical.com> Thu, 01 Sep 2011 15:30:30 -0400
186 +
187 +gtk3-engines-unico (1.0-0ubuntu1) oneiric; urgency=low
188 +
189 + * New upstream release.
190 +
191 + -- Ken VanDine <ken.vandine@canonical.com> Wed, 10 Aug 2011 11:38:14 -0400
192 +
193 +gtk3-engines-unico (0.1.0+r74-0ubuntu1) oneiric; urgency=low
194 +
195 + * New upstream release.
196 + * debian/control
197 + - bump build depends for libgtk-3-dev >= 3.1.6
198 +
199 + -- Ken VanDine <ken.vandine@canonical.com> Thu, 30 Jun 2011 10:51:38 +0100
200 +
201 +gtk3-engines-unico (0.1.0+r69-0ubuntu1) oneiric; urgency=low
202 +
203 + * New upstream snapshot.
204 + * debian/control
205 + - Updated Vcs-Bzr to point to the proper project
206 + - Updated maintainer email to use @ubuntu.com
207 + - Updated standards version to 3.9.2
208 +
209 + -- Ken VanDine <ken.vandine@canonical.com> Fri, 17 Jun 2011 16:18:41 -0400
210 +
211 +gtk3-engines-unico (0.1.0+r66-0ubuntu1) oneiric; urgency=low
212 +
213 + * New upstream snapshot.
214 + - Fix for a gnome-control-center crasher (LP: #789010)
215 +
216 + -- Ken VanDine <ken.vandine@canonical.com> Wed, 01 Jun 2011 13:21:40 -0400
217 +
218 +gtk3-engines-unico (0.1.0+r64-0ubuntu1) oneiric; urgency=low
219 +
220 + * Initial packaging
221 +
222 + -- Ken VanDine <ken.vandine@canonical.com> Thu, 19 May 2011 09:46:01 -0400
224 === added file 'debian/compat'
225 --- debian/compat 1970-01-01 00:00:00 +0000
226 +++ debian/compat 2016-01-19 12:14:18 +0000
227 @@ -0,0 +1,1 @@
228 +9
230 === added file 'debian/control'
231 --- debian/control 1970-01-01 00:00:00 +0000
232 +++ debian/control 2016-01-19 12:14:18 +0000
233 @@ -0,0 +1,28 @@
234 +Source: unico
235 +Section: x11
236 +Priority: optional
237 +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
238 +Build-Depends: autotools-dev,
239 + debhelper (>= 9),
240 + dh-autoreconf,
241 + gnome-common,
242 + libcairo2-dev (>= 1.10),
243 + libglib2.0-dev (>= 2.26.0),
244 + libgtk-3-dev (>= 3.5.2),
245 +Standards-Version: 3.9.3
246 +Homepage: https://launchpad.net/unico
247 +# If you aren't a member of ~unico-team but need to upload
248 +# packaging changes, just go ahead. ~unico-team will notice
249 +# and sync up the code again.
250 +Vcs-Bzr: https://code.launchpad.net/~unico-team/unico/trunk
251 +Vcs-Browser: https://bazaar.launchpad.net/~unico-team/unico/trunk/files
252 +
253 +Package: gtk3-engines-unico
254 +Architecture: any
255 +Depends: ${misc:Depends},
256 + ${shlibs:Depends},
257 +Multi-Arch: same
258 +Description: Unico Gtk+ 3 theme engine
259 + Unico is a Gtk+ engine that aims to be the more complete yet powerful theming
260 + engine for Gtk+ 3.0 and newer. It’s the first Gtk+ engine written with Gtk+
261 + style context APIs in mind, using CSS as first class citizen.
263 === added file 'debian/copyright'
264 --- debian/copyright 1970-01-01 00:00:00 +0000
265 +++ debian/copyright 2016-01-19 12:14:18 +0000
266 @@ -0,0 +1,19 @@
267 +Format: http://dep.debian.net/deps/dep5
268 +Upstream-Name: gtk3-engines-unico
269 +Upstream-Contact: Andrea Cimitan <andrea.cimitan@canonical.com>
270 +Source: https://launchpad.net/unico
271 +
272 +Files: *
273 +Copyright: 2011-2012 Canonical Ltd
274 +License: LGPL-2.1
275 + This library is free software; you can redistribute it and/or modify
276 + it under the terms of the GNU Lesser General Public License
277 + version 2.1 as published by the Free Software Foundation.
278 + .
279 + This library is distributed in the hope that it will be useful,
280 + but WITHOUT ANY WARRANTY; without even the implied warranty of
281 + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
282 + Lesser General Public License for more details.
283 + .
284 + On Debian systems, the complete text of the GNU Lesser General Public
285 + Licence can be found in `/usr/share/common-licenses/LGPL-2.1'
287 === added file 'debian/docs'
288 --- debian/docs 1970-01-01 00:00:00 +0000
289 +++ debian/docs 2016-01-19 12:14:18 +0000
290 @@ -0,0 +1,2 @@
291 +NEWS
292 +README
294 === added file 'debian/rules'
295 --- debian/rules 1970-01-01 00:00:00 +0000
296 +++ debian/rules 2016-01-19 12:14:18 +0000
297 @@ -0,0 +1,17 @@
298 +#!/usr/bin/make -f
299 +# -*- makefile -*-
300 +# Uncomment this to turn on verbose mode.
301 +#export DH_VERBOSE=1
302 +
303 +export DPKG_GENSYMBOLS_CHECK_LEVEL=4
304 +
305 +%:
306 + dh $@ --with autoreconf
307 +
308 +override_dh_autoreconf:
309 + NOCONFIGURE=1 dh_autoreconf ./autogen.sh
310 +
311 +override_dh_install:
312 + find debian/gtk3-engines-unico/usr/lib -name \*.la -exec rm {} \;
313 + find debian/gtk3-engines-unico/usr/lib -name \*.a -exec rm {} \;
314 + dh_install --fail-missing
316 === added directory 'debian/source'
317 === added file 'debian/source/format'
318 --- debian/source/format 1970-01-01 00:00:00 +0000
319 +++ debian/source/format 2016-01-19 12:14:18 +0000
320 @@ -0,0 +1,1 @@
321 +1.0
323 === removed directory 'tests'
324 === removed file 'tests/Makefile.am'
325 --- tests/Makefile.am 2011-05-18 13:41:46 +0000
326 +++ tests/Makefile.am 1970-01-01 00:00:00 +0000
327 @@ -1,17 +0,0 @@
328 -EXTRA_DIST = \
329 - test-widgets.glade
330 -
331 -noinst_PROGRAMS = \
332 - test-widgets
333 -
334 -test_widgets_CFLAGS = \
335 - -I$(top_srcdir) \
336 - $(UNICO_CFLAGS)
337 -
338 -test_widgets_LDADD = \
339 - $(UNICO_LIBADD)
340 -
341 -test_widgets_LDFLAGS = \
342 - $(UNICO_LDFLAGS)
343 -
344 -# FIXME(Cimi): Figure out what tests must be compiled and add them here.
346 === removed file 'tests/test-widgets.c'
347 --- tests/test-widgets.c 2011-05-18 13:41:46 +0000
348 +++ tests/test-widgets.c 1970-01-01 00:00:00 +0000
349 @@ -1,45 +0,0 @@
350 -/* The Unico Theming Engine for Gtk+.
351 - * Copyright (C) 2011 Canonical Ltd
352 - *
353 - * This library is free software; you can redistribute it and/or
354 - * modify it under the terms of the GNU Lesser General Public
355 - * License as published by the Free Software Foundation; either
356 - * version 2 of the License, or (at your option) any later version.
357 - *
358 - * This library is distributed in the hope that it will be useful,
359 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
360 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
361 - * Lesser General Public License for more details.
362 - *
363 - * You should have received a copy of the GNU Lesser General Public
364 - * License along with this library; if not, write to the Free
365 - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
366 - * MA 02110-1301, USA.
367 - *
368 - * Authored by Andrea Cimitan <andrea.cimitan@canonical.com>
369 - *
370 - */
371 -
372 -#include <gtk/gtk.h>
373 -
374 -int
375 -main (int argc, char *argv[])
376 -{
377 - GtkBuilder *builder;
378 - GtkWidget *window;
379 -
380 - gtk_init (&argc, &argv);
381 -
382 - builder = gtk_builder_new ();
383 - gtk_builder_add_from_file (builder, "./test-widgets.glade", NULL);
384 -
385 - window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
386 - gtk_builder_connect_signals (builder, NULL);
387 -
388 - g_object_unref (G_OBJECT (builder));
389 -
390 - gtk_widget_show (window);
391 - gtk_main ();
392 -
393 - return 0;
394 -}
396 === removed file 'tests/test-widgets.glade'
397 --- tests/test-widgets.glade 2011-05-18 13:41:46 +0000
398 +++ tests/test-widgets.glade 1970-01-01 00:00:00 +0000
399 @@ -1,1717 +0,0 @@
400 -<?xml version="1.0" encoding="UTF-8"?>
401 -<interface>
402 - <!-- interface-requires gtk+ 3.0 -->
403 - <object class="GtkAdjustment" id="adjustment1">
404 - <property name="upper">100</property>
405 - <property name="value">50</property>
406 - <property name="step_increment">1</property>
407 - <property name="page_increment">10</property>
408 - </object>
409 - <object class="GtkListStore" id="liststore1">
410 - <columns>
411 - <!-- column-name Cool -->
412 - <column type="gboolean"/>
413 - <!-- column-name Name -->
414 - <column type="gchararray"/>
415 - <!-- column-name Nick -->
416 - <column type="gchararray"/>
417 - </columns>
418 - <data>
419 - <row>
420 - <col id="0">True</col>
421 - <col id="1" translatable="yes">Andrea</col>
422 - <col id="2" translatable="yes">Cimi</col>
423 - </row>
424 - <row>
425 - <col id="0">False</col>
426 - <col id="1" translatable="yes">Otto</col>
427 - <col id="2" translatable="yes">chaotic</col>
428 - </row>
429 - </data>
430 - </object>
431 - <object class="GtkTextBuffer" id="textbuffer1">
432 - <property name="text">Lorem ipsum dolor sit amet, consectetur adipiscing elit.
433 -Nullam fringilla, est ut feugiat ultrices, elit lacus ultricies nibh, id commodo tortor nisi id elit.
434 -Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
435 -Morbi vel elit erat. Maecenas dignissim, dui et pharetra rutrum, tellus lectus rutrum mi, a convallis libero nisi quis tellus.
436 -Nulla facilisi. Nullam eleifend lobortis nisl, in porttitor tellus malesuada vitae.
437 -Aenean lacus tellus, pellentesque quis molestie quis, fringilla in arcu.
438 -Duis elementum, tellus sed tristique semper, metus metus accumsan augue, et porttitor augue orci a libero.
439 -Ut sed justo ac felis placerat laoreet sed id sem. Proin mattis tincidunt odio vitae tristique.
440 -Morbi massa libero, congue vitae scelerisque vel, ultricies vel nisl.
441 -Vestibulum in tortor diam, quis aliquet quam. Praesent ut justo neque, tempus rutrum est.
442 -Duis eu lectus quam. Vivamus eget metus a mauris molestie venenatis pulvinar eleifend nisi.
443 -Nulla facilisi. Pellentesque at dolor sit amet purus dapibus pulvinar molestie quis neque.
444 -Suspendisse feugiat quam quis dolor accumsan cursus. </property>
445 - </object>
446 - <object class="GtkWindow" id="window">
447 - <property name="can_focus">False</property>
448 - <child>
449 - <object class="GtkBox" id="box1">
450 - <property name="visible">True</property>
451 - <property name="can_focus">False</property>
452 - <property name="orientation">vertical</property>
453 - <child>
454 - <object class="GtkMenuBar" id="menubar1">
455 - <property name="visible">True</property>
456 - <property name="can_focus">False</property>
457 - <child>
458 - <object class="GtkMenuItem" id="menuitem1">
459 - <property name="visible">True</property>
460 - <property name="can_focus">False</property>
461 - <property name="use_action_appearance">False</property>
462 - <property name="label" translatable="yes">_File</property>
463 - <property name="use_underline">True</property>
464 - <child type="submenu">
465 - <object class="GtkMenu" id="menu1">
466 - <property name="visible">True</property>
467 - <property name="can_focus">False</property>
468 - <child>
469 - <object class="GtkImageMenuItem" id="imagemenuitem1">
470 - <property name="label">gtk-new</property>
471 - <property name="visible">True</property>
472 - <property name="can_focus">False</property>
473 - <property name="use_action_appearance">False</property>
474 - <property name="use_underline">True</property>
475 - <property name="use_stock">True</property>
476 - </object>
477 - </child>
478 - <child>
479 - <object class="GtkImageMenuItem" id="imagemenuitem2">
480 - <property name="label">gtk-open</property>
481 - <property name="visible">True</property>
482 - <property name="can_focus">False</property>
483 - <property name="use_action_appearance">False</property>
484 - <property name="use_underline">True</property>
485 - <property name="use_stock">True</property>
486 - </object>
487 - </child>
488 - <child>
489 - <object class="GtkImageMenuItem" id="imagemenuitem3">
490 - <property name="label">gtk-save</property>
491 - <property name="visible">True</property>
492 - <property name="can_focus">False</property>
493 - <property name="use_action_appearance">False</property>
494 - <property name="use_underline">True</property>
495 - <property name="use_stock">True</property>
496 - </object>
497 - </child>
498 - <child>
499 - <object class="GtkImageMenuItem" id="imagemenuitem4">
500 - <property name="label">gtk-save-as</property>
501 - <property name="visible">True</property>
502 - <property name="can_focus">False</property>
503 - <property name="use_action_appearance">False</property>
504 - <property name="use_underline">True</property>
505 - <property name="use_stock">True</property>
506 - </object>
507 - </child>
508 - <child>
509 - <object class="GtkSeparatorMenuItem" id="separatormenuitem1">
510 - <property name="visible">True</property>
511 - <property name="can_focus">False</property>
512 - <property name="use_action_appearance">False</property>
513 - </object>
514 - </child>
515 - <child>
516 - <object class="GtkImageMenuItem" id="imagemenuitem5">
517 - <property name="label">gtk-quit</property>
518 - <property name="visible">True</property>
519 - <property name="can_focus">False</property>
520 - <property name="use_action_appearance">False</property>
521 - <property name="use_underline">True</property>
522 - <property name="use_stock">True</property>
523 - </object>
524 - </child>
525 - </object>
526 - </child>
527 - </object>
528 - </child>
529 - <child>
530 - <object class="GtkMenuItem" id="menuitem2">
531 - <property name="visible">True</property>
532 - <property name="can_focus">False</property>
533 - <property name="use_action_appearance">False</property>
534 - <property name="label" translatable="yes">_Edit</property>
535 - <property name="use_underline">True</property>
536 - <child type="submenu">
537 - <object class="GtkMenu" id="menu2">
538 - <property name="visible">True</property>
539 - <property name="can_focus">False</property>
540 - <child>
541 - <object class="GtkImageMenuItem" id="imagemenuitem6">
542 - <property name="label">gtk-cut</property>
543 - <property name="visible">True</property>
544 - <property name="can_focus">False</property>
545 - <property name="use_action_appearance">False</property>
546 - <property name="use_underline">True</property>
547 - <property name="use_stock">True</property>
548 - </object>
549 - </child>
550 - <child>
551 - <object class="GtkImageMenuItem" id="imagemenuitem7">
552 - <property name="label">gtk-copy</property>
553 - <property name="visible">True</property>
554 - <property name="can_focus">False</property>
555 - <property name="use_action_appearance">False</property>
556 - <property name="use_underline">True</property>
557 - <property name="use_stock">True</property>
558 - </object>
559 - </child>
560 - <child>
561 - <object class="GtkImageMenuItem" id="imagemenuitem8">
562 - <property name="label">gtk-paste</property>
563 - <property name="visible">True</property>
564 - <property name="can_focus">False</property>
565 - <property name="use_action_appearance">False</property>
566 - <property name="use_underline">True</property>
567 - <property name="use_stock">True</property>
568 - </object>
569 - </child>
570 - <child>
571 - <object class="GtkImageMenuItem" id="imagemenuitem9">
572 - <property name="label">gtk-delete</property>
573 - <property name="visible">True</property>
574 - <property name="can_focus">False</property>
575 - <property name="use_action_appearance">False</property>
576 - <property name="use_underline">True</property>
577 - <property name="use_stock">True</property>
578 - </object>
579 - </child>
580 - </object>
581 - </child>
582 - </object>
583 - </child>
584 - <child>
585 - <object class="GtkMenuItem" id="menuitem3">
586 - <property name="visible">True</property>
587 - <property name="can_focus">False</property>
588 - <property name="use_action_appearance">False</property>
589 - <property name="label" translatable="yes">_View</property>
590 - <property name="use_underline">True</property>
591 - </object>
592 - </child>
593 - <child>
594 - <object class="GtkMenuItem" id="menuitem4">
595 - <property name="visible">True</property>
596 - <property name="can_focus">False</property>
597 - <property name="use_action_appearance">False</property>
598 - <property name="label" translatable="yes">_Help</property>
599 - <property name="use_underline">True</property>
600 - <child type="submenu">
601 - <object class="GtkMenu" id="menu3">
602 - <property name="visible">True</property>
603 - <property name="can_focus">False</property>
604 - <child>
605 - <object class="GtkImageMenuItem" id="imagemenuitem10">
606 - <property name="label">gtk-about</property>
607 - <property name="visible">True</property>
608 - <property name="can_focus">False</property>
609 - <property name="use_action_appearance">False</property>
610 - <property name="use_underline">True</property>
611 - <property name="use_stock">True</property>
612 - </object>
613 - </child>
614 - </object>
615 - </child>
616 - </object>
617 - </child>
618 - </object>
619 - <packing>
620 - <property name="expand">False</property>
621 - <property name="fill">True</property>
622 - <property name="position">0</property>
623 - </packing>
624 - </child>
625 - <child>
626 - <object class="GtkToolbar" id="toolbar1">
627 - <property name="visible">True</property>
628 - <property name="can_focus">False</property>
629 - <child>
630 - <object class="GtkToolButton" id="toolbutton2">
631 - <property name="visible">True</property>
632 - <property name="can_focus">False</property>
633 - <property name="use_action_appearance">False</property>
634 - <property name="label" translatable="yes">Save</property>
635 - <property name="use_underline">True</property>
636 - <property name="stock_id">gtk-save</property>
637 - </object>
638 - <packing>
639 - <property name="expand">False</property>
640 - <property name="homogeneous">True</property>
641 - </packing>
642 - </child>
643 - <child>
644 - <object class="GtkToolButton" id="toolbutton1">
645 - <property name="visible">True</property>
646 - <property name="can_focus">False</property>
647 - <property name="use_action_appearance">False</property>
648 - <property name="label" translatable="yes">Open</property>
649 - <property name="use_underline">True</property>
650 - <property name="stock_id">gtk-open</property>
651 - </object>
652 - <packing>
653 - <property name="expand">False</property>
654 - <property name="homogeneous">True</property>
655 - </packing>
656 - </child>
657 - <child>
658 - <object class="GtkSeparatorToolItem" id="toolbutton3">
659 - <property name="visible">True</property>
660 - <property name="can_focus">False</property>
661 - <property name="use_action_appearance">False</property>
662 - </object>
663 - <packing>
664 - <property name="expand">False</property>
665 - <property name="homogeneous">True</property>
666 - </packing>
667 - </child>
668 - <child>
669 - <object class="GtkToolButton" id="toolbutton4">
670 - <property name="visible">True</property>
671 - <property name="can_focus">False</property>
672 - <property name="use_action_appearance">False</property>
673 - <property name="label" translatable="yes">Find</property>
674 - <property name="use_underline">True</property>
675 - <property name="stock_id">gtk-find</property>
676 - </object>
677 - <packing>
678 - <property name="expand">False</property>
679 - <property name="homogeneous">True</property>
680 - </packing>
681 - </child>
682 - <child>
683 - <object class="GtkToolItem" id="toolbutton5">
684 - <property name="visible">True</property>
685 - <property name="can_focus">False</property>
686 - <property name="use_action_appearance">False</property>
687 - <child>
688 - <placeholder/>
689 - </child>
690 - </object>
691 - <packing>
692 - <property name="expand">True</property>
693 - <property name="homogeneous">True</property>
694 - </packing>
695 - </child>
696 - <child>
697 - <object class="GtkToolItem" id="toolbutton6">
698 - <property name="visible">True</property>
699 - <property name="can_focus">False</property>
700 - <property name="use_action_appearance">False</property>
701 - <child>
702 - <object class="GtkEntry" id="entry3">
703 - <property name="visible">True</property>
704 - <property name="can_focus">True</property>
705 - <property name="invisible_char">•</property>
706 - <property name="text" translatable="yes">search...</property>
707 - </object>
708 - </child>
709 - </object>
710 - <packing>
711 - <property name="expand">False</property>
712 - </packing>
713 - </child>
714 - </object>
715 - <packing>
716 - <property name="expand">False</property>
717 - <property name="fill">True</property>
718 - <property name="position">1</property>
719 - </packing>
720 - </child>
721 - <child>
722 - <object class="GtkBox" id="box2">
723 - <property name="visible">True</property>
724 - <property name="can_focus">False</property>
725 - <property name="spacing">6</property>
726 - <child>
727 - <object class="GtkBox" id="box3">
728 - <property name="visible">True</property>
729 - <property name="can_focus">False</property>
730 - <property name="orientation">vertical</property>
731 - <property name="spacing">4</property>
732 - <child>
733 - <object class="GtkComboBoxText" id="comboboxtext1">
734 - <property name="visible">True</property>
735 - <property name="can_focus">False</property>
736 - <property name="has_entry">True</property>
737 - <child internal-child="entry">
738 - <object class="GtkEntry" id="comboboxtext-entry">
739 - <property name="can_focus">False</property>
740 - <property name="text" translatable="yes">comboboxentry</property>
741 - </object>
742 - </child>
743 - </object>
744 - <packing>
745 - <property name="expand">False</property>
746 - <property name="fill">False</property>
747 - <property name="position">0</property>
748 - </packing>
749 - </child>
750 - <child>
751 - <object class="GtkComboBoxText" id="comboboxtext2">
752 - <property name="visible">True</property>
753 - <property name="sensitive">False</property>
754 - <property name="can_focus">False</property>
755 - <property name="has_entry">True</property>
756 - <child internal-child="entry">
757 - <object class="GtkEntry" id="comboboxtext-entry2">
758 - <property name="can_focus">False</property>
759 - <property name="invisible_char">•</property>
760 - <property name="text" translatable="yes">comboboxentry</property>
761 - </object>
762 - </child>
763 - </object>
764 - <packing>
765 - <property name="expand">False</property>
766 - <property name="fill">False</property>
767 - <property name="position">1</property>
768 - </packing>
769 - </child>
770 - <child>
771 - <object class="GtkEntry" id="entry1">
772 - <property name="visible">True</property>
773 - <property name="can_focus">True</property>
774 - <property name="invisible_char">•</property>
775 - <property name="text" translatable="yes">entry</property>
776 - </object>
777 - <packing>
778 - <property name="expand">False</property>
779 - <property name="fill">False</property>
780 - <property name="position">2</property>
781 - </packing>
782 - </child>
783 - <child>
784 - <object class="GtkEntry" id="entry2">
785 - <property name="visible">True</property>
786 - <property name="sensitive">False</property>
787 - <property name="can_focus">True</property>
788 - <property name="invisible_char">•</property>
789 - <property name="text" translatable="yes">entry</property>
790 - </object>
791 - <packing>
792 - <property name="expand">False</property>
793 - <property name="fill">False</property>
794 - <property name="position">3</property>
795 - </packing>
796 - </child>
797 - <child>
798 - <object class="GtkBox" id="box18">
799 - <property name="visible">True</property>
800 - <property name="can_focus">False</property>
801 - <property name="spacing">20</property>
802 - <child>
803 - <object class="GtkLabel" id="label3">
804 - <property name="visible">True</property>
805 - <property name="can_focus">False</property>
806 - <property name="label" translatable="yes">label</property>
807 - </object>
808 - <packing>
809 - <property name="expand">False</property>
810 - <property name="fill">True</property>
811 - <property name="position">0</property>
812 - </packing>
813 - </child>
814 - <child>
815 - <object class="GtkLabel" id="label4">
816 - <property name="visible">True</property>
817 - <property name="sensitive">False</property>
818 - <property name="can_focus">False</property>
819 - <property name="label" translatable="yes">label</property>
820 - </object>
821 - <packing>
822 - <property name="expand">False</property>
823 - <property name="fill">True</property>
824 - <property name="position">1</property>
825 - </packing>
826 - </child>
827 - <child>
828 - <object class="GtkSpinButton" id="spinbutton1">
829 - <property name="visible">True</property>
830 - <property name="can_focus">True</property>
831 - <property name="invisible_char">•</property>
832 - </object>
833 - <packing>
834 - <property name="expand">False</property>
835 - <property name="fill">False</property>
836 - <property name="position">2</property>
837 - </packing>
838 - </child>
839 - <child>
840 - <object class="GtkSpinButton" id="spinbutton2">
841 - <property name="visible">True</property>
842 - <property name="can_focus">True</property>
843 - <property name="invisible_char">•</property>
844 - </object>
845 - <packing>
846 - <property name="expand">False</property>
847 - <property name="fill">False</property>
848 - <property name="position">3</property>
849 - </packing>
850 - </child>
851 - </object>
852 - <packing>
853 - <property name="expand">False</property>
854 - <property name="fill">False</property>
855 - <property name="position">4</property>
856 - </packing>
857 - </child>
858 - <child>
859 - <object class="GtkGrid" id="grid1">
860 - <property name="visible">True</property>
861 - <property name="can_focus">False</property>
862 - <property name="row_homogeneous">True</property>
863 - <property name="n_rows">4</property>
864 - <property name="n_columns">2</property>
865 - <child>
866 - <object class="GtkCheckButton" id="checkbutton1">
867 - <property name="label" translatable="yes">checkbutton</property>
868 - <property name="visible">True</property>
869 - <property name="can_focus">True</property>
870 - <property name="receives_default">False</property>
871 - <property name="use_action_appearance">False</property>
872 - <property name="xalign">0</property>
873 - <property name="active">True</property>
874 - <property name="draw_indicator">True</property>
875 - </object>
876 - <packing>
877 - <property name="left_attach">0</property>
878 - <property name="top_attach">0</property>
879 - <property name="width">1</property>
880 - <property name="height">1</property>
881 - </packing>
882 - </child>
883 - <child>
884 - <object class="GtkCheckButton" id="checkbutton2">
885 - <property name="label" translatable="yes">checkbutton</property>
886 - <property name="visible">True</property>
887 - <property name="can_focus">True</property>
888 - <property name="receives_default">False</property>
889 - <property name="use_action_appearance">False</property>
890 - <property name="xalign">0</property>
891 - <property name="draw_indicator">True</property>
892 - </object>
893 - <packing>
894 - <property name="left_attach">0</property>
895 - <property name="top_attach">1</property>
896 - <property name="width">1</property>
897 - <property name="height">1</property>
898 - </packing>
899 - </child>
900 - <child>
901 - <object class="GtkCheckButton" id="checkbutton3">
902 - <property name="label" translatable="yes">checkbutton</property>
903 - <property name="visible">True</property>
904 - <property name="sensitive">False</property>
905 - <property name="can_focus">True</property>
906 - <property name="receives_default">False</property>
907 - <property name="use_action_appearance">False</property>
908 - <property name="xalign">0</property>
909 - <property name="active">True</property>
910 - <property name="draw_indicator">True</property>
911 - </object>
912 - <packing>
913 - <property name="left_attach">0</property>
914 - <property name="top_attach">2</property>
915 - <property name="width">1</property>
916 - <property name="height">1</property>
917 - </packing>
918 - </child>
919 - <child>
920 - <object class="GtkCheckButton" id="checkbutton4">
921 - <property name="label" translatable="yes">checkbutton</property>
922 - <property name="visible">True</property>
923 - <property name="sensitive">False</property>
924 - <property name="can_focus">True</property>
925 - <property name="receives_default">False</property>
926 - <property name="use_action_appearance">False</property>
927 - <property name="xalign">0</property>
928 - <property name="draw_indicator">True</property>
929 - </object>
930 - <packing>
931 - <property name="left_attach">0</property>
932 - <property name="top_attach">3</property>
933 - <property name="width">1</property>
934 - <property name="height">1</property>
935 - </packing>
936 - </child>
937 - <child>
938 - <object class="GtkRadioButton" id="radiobutton1">
939 - <property name="label" translatable="yes">radiobutton</property>
940 - <property name="visible">True</property>
941 - <property name="can_focus">True</property>
942 - <property name="receives_default">False</property>
943 - <property name="use_action_appearance">False</property>
944 - <property name="xalign">0</property>
945 - <property name="active">True</property>
946 - <property name="draw_indicator">True</property>
947 - </object>
948 - <packing>
949 - <property name="left_attach">1</property>
950 - <property name="top_attach">0</property>
951 - <property name="width">1</property>
952 - <property name="height">1</property>
953 - </packing>
954 - </child>
955 - <child>
956 - <object class="GtkRadioButton" id="radiobutton2">
957 - <property name="label" translatable="yes">radiobutton</property>
958 - <property name="visible">True</property>
959 - <property name="can_focus">True</property>
960 - <property name="receives_default">False</property>
961 - <property name="use_action_appearance">False</property>
962 - <property name="xalign">0</property>
963 - <property name="active">True</property>
964 - <property name="draw_indicator">True</property>
965 - <property name="group">radiobutton1</property>
966 - </object>
967 - <packing>
968 - <property name="left_attach">1</property>
969 - <property name="top_attach">1</property>
970 - <property name="width">1</property>
971 - <property name="height">1</property>
972 - </packing>
973 - </child>
974 - <child>
975 - <object class="GtkRadioButton" id="radiobutton3">
976 - <property name="label" translatable="yes">radiobutton</property>
977 - <property name="visible">True</property>
978 - <property name="sensitive">False</property>
979 - <property name="can_focus">True</property>
980 - <property name="receives_default">False</property>
981 - <property name="use_action_appearance">False</property>
982 - <property name="xalign">0</property>
983 - <property name="active">True</property>
984 - <property name="draw_indicator">True</property>
985 - </object>
986 - <packing>
987 - <property name="left_attach">1</property>
988 - <property name="top_attach">2</property>
989 - <property name="width">1</property>
990 - <property name="height">1</property>
991 - </packing>
992 - </child>
993 - <child>
994 - <object class="GtkRadioButton" id="radiobutton4">
995 - <property name="label" translatable="yes">radiobutton</property>
996 - <property name="visible">True</property>
997 - <property name="sensitive">False</property>
998 - <property name="can_focus">True</property>
999 - <property name="receives_default">False</property>
1000 - <property name="use_action_appearance">False</property>
1001 - <property name="xalign">0</property>
1002 - <property name="active">True</property>
1003 - <property name="draw_indicator">True</property>
1004 - <property name="group">radiobutton3</property>
1005 - </object>
1006 - <packing>
1007 - <property name="left_attach">1</property>
1008 - <property name="top_attach">3</property>
1009 - <property name="width">1</property>
1010 - <property name="height">1</property>
1011 - </packing>
1012 - </child>
1013 - </object>
1014 - <packing>
1015 - <property name="expand">False</property>
1016 - <property name="fill">False</property>
1017 - <property name="position">5</property>
1018 - </packing>
1019 - </child>
1020 - </object>
1021 - <packing>
1022 - <property name="expand">False</property>
1023 - <property name="fill">False</property>
1024 - <property name="padding">4</property>
1025 - <property name="position">0</property>
1026 - </packing>
1027 - </child>
1028 - <child>
1029 - <object class="GtkSeparator" id="separator1">
1030 - <property name="visible">True</property>
1031 - <property name="can_focus">False</property>
1032 - <property name="orientation">vertical</property>
1033 - </object>
1034 - <packing>
1035 - <property name="expand">False</property>
1036 - <property name="fill">True</property>
1037 - <property name="position">1</property>
1038 - </packing>
1039 - </child>
1040 - <child>
1041 - <object class="GtkBox" id="box19">
1042 - <property name="width_request">110</property>
1043 - <property name="visible">True</property>
1044 - <property name="can_focus">False</property>
1045 - <property name="orientation">vertical</property>
1046 - <property name="spacing">4</property>
1047 - <child>
1048 - <object class="GtkToggleButton" id="togglebutton1">
1049 - <property name="label" translatable="yes">togglebutton</property>
1050 - <property name="visible">True</property>
1051 - <property name="can_focus">True</property>
1052 - <property name="receives_default">True</property>
1053 - <property name="use_action_appearance">False</property>
1054 - </object>
1055 - <packing>
1056 - <property name="expand">False</property>
1057 - <property name="fill">False</property>
1058 - <property name="position">0</property>
1059 - </packing>
1060 - </child>
1061 - <child>
1062 - <object class="GtkToggleButton" id="togglebutton2">
1063 - <property name="label" translatable="yes">togglebutton</property>
1064 - <property name="visible">True</property>
1065 - <property name="sensitive">False</property>
1066 - <property name="can_focus">True</property>
1067 - <property name="receives_default">True</property>
1068 - <property name="use_action_appearance">False</property>
1069 - </object>
1070 - <packing>
1071 - <property name="expand">False</property>
1072 - <property name="fill">False</property>
1073 - <property name="position">1</property>
1074 - </packing>
1075 - </child>
1076 - <child>
1077 - <object class="GtkToggleButton" id="togglebutton3">
1078 - <property name="label" translatable="yes">togglebutton</property>
1079 - <property name="visible">True</property>
1080 - <property name="can_focus">True</property>
1081 - <property name="receives_default">True</property>
1082 - <property name="use_action_appearance">False</property>
1083 - <property name="active">True</property>
1084 - </object>
1085 - <packing>
1086 - <property name="expand">False</property>
1087 - <property name="fill">False</property>
1088 - <property name="position">2</property>
1089 - </packing>
1090 - </child>
1091 - <child>
1092 - <object class="GtkToggleButton" id="togglebutton4">
1093 - <property name="label" translatable="yes">togglebutton</property>
1094 - <property name="visible">True</property>
1095 - <property name="sensitive">False</property>
1096 - <property name="can_focus">True</property>
1097 - <property name="receives_default">True</property>
1098 - <property name="use_action_appearance">False</property>
1099 - <property name="active">True</property>
1100 - </object>
1101 - <packing>
1102 - <property name="expand">False</property>
1103 - <property name="fill">False</property>
1104 - <property name="position">3</property>
1105 - </packing>
1106 - </child>
1107 - <child>
1108 - <object class="GtkComboBox" id="combobox1">
1109 - <property name="visible">True</property>
1110 - <property name="can_focus">False</property>
1111 - <property name="model">liststore1</property>
1112 - <property name="active">0</property>
1113 - <child>
1114 - <object class="GtkCellRendererText" id="cellrenderertext1"/>
1115 - <attributes>
1116 - <attribute name="text">2</attribute>
1117 - </attributes>
1118 - </child>
1119 - </object>
1120 - <packing>
1121 - <property name="expand">False</property>
1122 - <property name="fill">True</property>
1123 - <property name="position">5</property>
1124 - </packing>
1125 - </child>
1126 - <child>
1127 - <object class="GtkComboBox" id="combobox2">
1128 - <property name="visible">True</property>
1129 - <property name="sensitive">False</property>
1130 - <property name="can_focus">False</property>
1131 - <property name="model">liststore1</property>
1132 - <property name="active">1</property>
1133 - <child>
1134 - <object class="GtkCellRendererText" id="cellrenderertext2"/>
1135 - <attributes>
1136 - <attribute name="text">2</attribute>
1137 - </attributes>
1138 - </child>
1139 - </object>
1140 - <packing>
1141 - <property name="expand">False</property>
1142 - <property name="fill">False</property>
1143 - <property name="position">6</property>
1144 - </packing>
1145 - </child>
1146 - <child>
1147 - <object class="GtkFontButton" id="fontbutton1">
1148 - <property name="visible">True</property>
1149 - <property name="can_focus">True</property>
1150 - <property name="receives_default">True</property>
1151 - <property name="use_action_appearance">False</property>
1152 - </object>
1153 - <packing>
1154 - <property name="expand">False</property>
1155 - <property name="fill">False</property>
1156 - <property name="position">6</property>
1157 - </packing>
1158 - </child>
1159 - <child>
1160 - <object class="GtkColorButton" id="colorbutton1">
1161 - <property name="visible">True</property>
1162 - <property name="can_focus">True</property>
1163 - <property name="receives_default">True</property>
1164 - <property name="use_action_appearance">False</property>
1165 - <property name="color">#31316867a09f</property>
1166 - </object>
1167 - <packing>
1168 - <property name="expand">False</property>
1169 - <property name="fill">True</property>
1170 - <property name="position">8</property>
1171 - </packing>
1172 - </child>
1173 - <child>
1174 - <object class="GtkFileChooserButton" id="filechooserbutton1">
1175 - <property name="visible">True</property>
1176 - <property name="can_focus">False</property>
1177 - </object>
1178 - <packing>
1179 - <property name="expand">False</property>
1180 - <property name="fill">True</property>
1181 - <property name="position">8</property>
1182 - </packing>
1183 - </child>
1184 - </object>
1185 - <packing>
1186 - <property name="expand">False</property>
1187 - <property name="fill">False</property>
1188 - <property name="position">2</property>
1189 - </packing>
1190 - </child>
1191 - <child>
1192 - <object class="GtkSeparator" id="separator2">
1193 - <property name="visible">True</property>
1194 - <property name="can_focus">False</property>
1195 - <property name="orientation">vertical</property>
1196 - </object>
1197 - <packing>
1198 - <property name="expand">False</property>
1199 - <property name="fill">True</property>
1200 - <property name="position">3</property>
1201 - </packing>
1202 - </child>
1203 - <child>
1204 - <object class="GtkBox" id="box20">
1205 - <property name="visible">True</property>
1206 - <property name="can_focus">False</property>
1207 - <property name="orientation">vertical</property>
1208 - <property name="spacing">4</property>
1209 - <child>
1210 - <object class="GtkBox" id="box21">
1211 - <property name="visible">True</property>
1212 - <property name="can_focus">False</property>
1213 - <property name="orientation">vertical</property>
1214 - <property name="spacing">8</property>
1215 - <property name="homogeneous">True</property>
1216 - <child>
1217 - <object class="GtkProgressBar" id="progressbar1">
1218 - <property name="visible">True</property>
1219 - <property name="can_focus">False</property>
1220 - <property name="fraction">0.5</property>
1221 - </object>
1222 - <packing>
1223 - <property name="expand">False</property>
1224 - <property name="fill">False</property>
1225 - <property name="position">0</property>
1226 - </packing>
1227 - </child>
1228 - <child>
1229 - <object class="GtkProgressBar" id="progressbar2">
1230 - <property name="visible">True</property>
1231 - <property name="can_focus">False</property>
1232 - <property name="fraction">0.5</property>
1233 - <property name="inverted">True</property>
1234 - </object>
1235 - <packing>
1236 - <property name="expand">False</property>
1237 - <property name="fill">False</property>
1238 - <property name="position">1</property>
1239 - </packing>
1240 - </child>
1241 - </object>
1242 - <packing>
1243 - <property name="expand">False</property>
1244 - <property name="fill">False</property>
1245 - <property name="position">0</property>
1246 - </packing>
1247 - </child>
1248 - <child>
1249 - <object class="GtkBox" id="box27">
1250 - <property name="visible">True</property>
1251 - <property name="can_focus">False</property>
1252 - <child>
1253 - <object class="GtkBox" id="box24">
1254 - <property name="visible">True</property>
1255 - <property name="can_focus">False</property>
1256 - <property name="hexpand">True</property>
1257 - <property name="orientation">vertical</property>
1258 - <property name="homogeneous">True</property>
1259 - <child>
1260 - <object class="GtkScale" id="scale1">
1261 - <property name="visible">True</property>
1262 - <property name="can_focus">True</property>
1263 - <property name="adjustment">adjustment1</property>
1264 - <property name="restrict_to_fill_level">False</property>
1265 - <property name="fill_level">75</property>
1266 - <property name="draw_value">False</property>
1267 - </object>
1268 - <packing>
1269 - <property name="expand">False</property>
1270 - <property name="fill">True</property>
1271 - <property name="position">0</property>
1272 - </packing>
1273 - </child>
1274 - <child>
1275 - <object class="GtkScale" id="scale2">
1276 - <property name="visible">True</property>
1277 - <property name="sensitive">False</property>
1278 - <property name="can_focus">True</property>
1279 - <property name="adjustment">adjustment1</property>
1280 - <property name="restrict_to_fill_level">False</property>
1281 - <property name="fill_level">75</property>
1282 - <property name="draw_value">False</property>
1283 - </object>
1284 - <packing>
1285 - <property name="expand">False</property>
1286 - <property name="fill">True</property>
1287 - <property name="position">1</property>
1288 - </packing>
1289 - </child>
1290 - </object>
1291 - <packing>
1292 - <property name="expand">True</property>
1293 - <property name="fill">True</property>
1294 - <property name="position">0</property>
1295 - </packing>
1296 - </child>
1297 - </object>
1298 - <packing>
1299 - <property name="expand">False</property>
1300 - <property name="fill">False</property>
1301 - <property name="position">1</property>
1302 - </packing>
1303 - </child>
1304 - <child>
1305 - <object class="GtkBox" id="box25">
1306 - <property name="visible">True</property>
1307 - <property name="can_focus">False</property>
1308 - <property name="homogeneous">True</property>
1309 - <child>
1310 - <object class="GtkBox" id="box28">
1311 - <property name="visible">True</property>
1312 - <property name="can_focus">False</property>
1313 - <property name="vexpand">True</property>
1314 - <property name="spacing">4</property>
1315 - <child>
1316 - <object class="GtkProgressBar" id="progressbar5">
1317 - <property name="visible">True</property>
1318 - <property name="can_focus">False</property>
1319 - <property name="orientation">vertical</property>
1320 - <property name="fraction">0.5</property>
1321 - </object>
1322 - <packing>
1323 - <property name="expand">False</property>
1324 - <property name="fill">True</property>
1325 - <property name="position">0</property>
1326 - </packing>
1327 - </child>
1328 - <child>
1329 - <object class="GtkProgressBar" id="progressbar6">
1330 - <property name="visible">True</property>
1331 - <property name="can_focus">False</property>
1332 - <property name="orientation">vertical</property>
1333 - <property name="fraction">0.5</property>
1334 - <property name="inverted">True</property>
1335 - </object>
1336 - <packing>
1337 - <property name="expand">False</property>
1338 - <property name="fill">True</property>
1339 - <property name="position">1</property>
1340 - </packing>
1341 - </child>
1342 - </object>
1343 - <packing>
1344 - <property name="expand">False</property>
1345 - <property name="fill">False</property>
1346 - <property name="position">0</property>
1347 - </packing>
1348 - </child>
1349 - <child>
1350 - <object class="GtkBox" id="box23">
1351 - <property name="visible">True</property>
1352 - <property name="can_focus">False</property>
1353 - <property name="vexpand">True</property>
1354 - <property name="spacing">4</property>
1355 - <child>
1356 - <object class="GtkScale" id="scale3">
1357 - <property name="height_request">100</property>
1358 - <property name="visible">True</property>
1359 - <property name="can_focus">True</property>
1360 - <property name="orientation">vertical</property>
1361 - <property name="adjustment">adjustment1</property>
1362 - <property name="restrict_to_fill_level">False</property>
1363 - <property name="fill_level">75</property>
1364 - <property name="draw_value">False</property>
1365 - </object>
1366 - <packing>
1367 - <property name="expand">False</property>
1368 - <property name="fill">True</property>
1369 - <property name="position">0</property>
1370 - </packing>
1371 - </child>
1372 - <child>
1373 - <object class="GtkScale" id="scale4">
1374 - <property name="height_request">100</property>
1375 - <property name="visible">True</property>
1376 - <property name="sensitive">False</property>
1377 - <property name="can_focus">True</property>
1378 - <property name="orientation">vertical</property>
1379 - <property name="adjustment">adjustment1</property>
1380 - <property name="restrict_to_fill_level">False</property>
1381 - <property name="fill_level">75</property>
1382 - <property name="draw_value">False</property>
1383 - </object>
1384 - <packing>
1385 - <property name="expand">False</property>
1386 - <property name="fill">True</property>
1387 - <property name="position">1</property>
1388 - </packing>
1389 - </child>
1390 - </object>
1391 - <packing>
1392 - <property name="expand">False</property>
1393 - <property name="fill">False</property>
1394 - <property name="position">1</property>
1395 - </packing>
1396 - </child>
1397 - </object>
1398 - <packing>
1399 - <property name="expand">True</property>
1400 - <property name="fill">True</property>
1401 - <property name="position">2</property>
1402 - </packing>
1403 - </child>
1404 - <child>
1405 - <object class="GtkBox" id="box22">
1406 - <property name="visible">True</property>
1407 - <property name="can_focus">False</property>
1408 - <property name="orientation">vertical</property>
1409 - <child>
1410 - <object class="GtkHandleBox" id="handlebox1">
1411 - <property name="visible">True</property>
1412 - <property name="can_focus">False</property>
1413 - <child>
1414 - <object class="GtkLinkButton" id="linkbutton1">
1415 - <property name="label" translatable="yes">link button</property>
1416 - <property name="visible">True</property>
1417 - <property name="can_focus">True</property>
1418 - <property name="receives_default">True</property>
1419 - <property name="has_tooltip">True</property>
1420 - <property name="use_action_appearance">False</property>
1421 - <property name="relief">none</property>
1422 - <property name="uri">http://www.ubuntu.com</property>
1423 - </object>
1424 - </child>
1425 - </object>
1426 - <packing>
1427 - <property name="expand">False</property>
1428 - <property name="fill">True</property>
1429 - <property name="position">0</property>
1430 - </packing>
1431 - </child>
1432 - <child>
1433 - <object class="GtkExpander" id="expander1">
1434 - <property name="visible">True</property>
1435 - <property name="can_focus">True</property>
1436 - <child>
1437 - <object class="GtkScrolledWindow" id="scrolledwindow3">
1438 - <property name="visible">True</property>
1439 - <property name="can_focus">True</property>
1440 - <property name="shadow_type">in</property>
1441 - <child>
1442 - <object class="GtkViewport" id="viewport1">
1443 - <property name="visible">True</property>
1444 - <property name="can_focus">False</property>
1445 - <child>
1446 - <object class="GtkLabel" id="label20">
1447 - <property name="visible">True</property>
1448 - <property name="can_focus">False</property>
1449 - <property name="label" translatable="yes">Lorem ipsum dolor sit amet, consectetur adipiscing elit.
1450 -Nullam fringilla, est ut feugiat ultrices, elit lacus ultricies nibh, id commodo tortor nisi id elit.
1451 -Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos.
1452 -Morbi vel elit erat. Maecenas dignissim, dui et pharetra rutrum, tellus lectus rutrum mi, a convallis libero nisi quis tellus.
1453 -Nulla facilisi. Nullam eleifend lobortis nisl, in porttitor tellus malesuada vitae.
1454 -Aenean lacus tellus, pellentesque quis molestie quis, fringilla in arcu.
1455 -Duis elementum, tellus sed tristique semper, metus metus accumsan augue, et porttitor augue orci a libero.
1456 -Ut sed justo ac felis placerat laoreet sed id sem. Proin mattis tincidunt odio vitae tristique.
1457 -Morbi massa libero, congue vitae scelerisque vel, ultricies vel nisl.
1458 -Vestibulum in tortor diam, quis aliquet quam. Praesent ut justo neque, tempus rutrum est.
1459 -Duis eu lectus quam. Vivamus eget metus a mauris molestie venenatis pulvinar eleifend nisi.
1460 -Nulla facilisi. Pellentesque at dolor sit amet purus dapibus pulvinar molestie quis neque.
1461 -Suspendisse feugiat quam quis dolor accumsan cursus. </property>
1462 - </object>
1463 - </child>
1464 - </object>
1465 - </child>
1466 - </object>
1467 - </child>
1468 - <child type="label">
1469 - <object class="GtkLabel" id="label19">
1470 - <property name="visible">True</property>
1471 - <property name="can_focus">False</property>
1472 - <property name="label" translatable="yes">expander</property>
1473 - </object>
1474 - </child>
1475 - </object>
1476 - <packing>
1477 - <property name="expand">False</property>
1478 - <property name="fill">True</property>
1479 - <property name="position">1</property>
1480 - </packing>
1481 - </child>
1482 - </object>
1483 - <packing>
1484 - <property name="expand">False</property>
1485 - <property name="fill">True</property>
1486 - <property name="position">3</property>
1487 - </packing>
1488 - </child>
1489 - </object>
1490 - <packing>
1491 - <property name="expand">False</property>
1492 - <property name="fill">False</property>
1493 - <property name="position">4</property>
1494 - </packing>
1495 - </child>
1496 - <child>
1497 - <object class="GtkSeparator" id="separator3">
1498 - <property name="visible">True</property>
1499 - <property name="can_focus">False</property>
1500 - <property name="orientation">vertical</property>
1501 - </object>
1502 - <packing>
1503 - <property name="expand">False</property>
1504 - <property name="fill">True</property>
1505 - <property name="position">5</property>
1506 - </packing>
1507 - </child>
1508 - <child>
1509 - <object class="GtkBox" id="box26">
1510 - <property name="visible">True</property>
1511 - <property name="can_focus">False</property>
1512 - <property name="orientation">vertical</property>
1513 - <property name="homogeneous">True</property>
1514 - <child>
1515 - <object class="GtkFrame" id="frame1">
1516 - <property name="visible">True</property>
1517 - <property name="can_focus">False</property>
1518 - <property name="label_xalign">0</property>
1519 - <property name="shadow_type">in</property>
1520 - <child>
1521 - <object class="GtkAlignment" id="alignment1">
1522 - <property name="visible">True</property>
1523 - <property name="can_focus">False</property>
1524 - <property name="left_padding">12</property>
1525 - <child>
1526 - <placeholder/>
1527 - </child>
1528 - </object>
1529 - </child>
1530 - <child type="label">
1531 - <object class="GtkLabel" id="label1">
1532 - <property name="visible">True</property>
1533 - <property name="can_focus">False</property>
1534 - <property name="label" translatable="yes"><b>In</b></property>
1535 - <property name="use_markup">True</property>
1536 - </object>
1537 - </child>
1538 - </object>
1539 - <packing>
1540 - <property name="expand">True</property>
1541 - <property name="fill">True</property>
1542 - <property name="position">0</property>
1543 - </packing>
1544 - </child>
1545 - <child>
1546 - <object class="GtkFrame" id="frame2">
1547 - <property name="visible">True</property>
1548 - <property name="can_focus">False</property>
1549 - <property name="label_xalign">0</property>
1550 - <property name="shadow_type">out</property>
1551 - <child>
1552 - <object class="GtkAlignment" id="alignment2">
1553 - <property name="visible">True</property>
1554 - <property name="can_focus">False</property>
1555 - <property name="left_padding">12</property>
1556 - <child>
1557 - <placeholder/>
1558 - </child>
1559 - </object>
1560 - </child>
1561 - <child type="label">
1562 - <object class="GtkLabel" id="label2">
1563 - <property name="visible">True</property>
1564 - <property name="can_focus">False</property>
1565 - <property name="label" translatable="yes"><b>Out</b></property>
1566 - <property name="use_markup">True</property>
1567 - </object>
1568 - </child>
1569 - </object>
1570 - <packing>
1571 - <property name="expand">True</property>
1572 - <property name="fill">True</property>
1573 - <property name="position">1</property>
1574 - </packing>
1575 - </child>
1576 - <child>
1577 - <object class="GtkFrame" id="frame3">
1578 - <property name="visible">True</property>
1579 - <property name="can_focus">False</property>
1580 - <property name="label_xalign">0</property>
1581 - <child>
1582 - <object class="GtkAlignment" id="alignment3">
1583 - <property name="visible">True</property>
1584 - <property name="can_focus">False</property>
1585 - <property name="left_padding">12</property>
1586 - <child>
1587 - <placeholder/>
1588 - </child>
1589 - </object>
1590 - </child>
1591 - <child type="label">
1592 - <object class="GtkLabel" id="label17">
1593 - <property name="visible">True</property>
1594 - <property name="can_focus">False</property>
1595 - <property name="label" translatable="yes"><b>Etched out</b></property>
1596 - <property name="use_markup">True</property>
1597 - </object>
1598 - </child>
1599 - </object>
1600 - <packing>
1601 - <property name="expand">True</property>
1602 - <property name="fill">True</property>
1603 - <property name="position">2</property>
1604 - </packing>
1605 - </child>
1606 - <child>
1607 - <object class="GtkFrame" id="frame4">
1608 - <property name="visible">True</property>
1609 - <property name="can_focus">False</property>
1610 - <property name="label_xalign">0</property>
1611 - <property name="shadow_type">etched-out</property>
1612 - <child>
1613 - <object class="GtkAlignment" id="alignment4">
1614 - <property name="visible">True</property>
1615 - <property name="can_focus">False</property>
1616 - <property name="left_padding">12</property>
1617 - <child>
1618 - <placeholder/>
1619 - </child>
1620 - </object>
1621 - </child>
1622 - <child type="label">
1623 - <object class="GtkLabel" id="label18">
1624 - <property name="visible">True</property>
1625 - <property name="can_focus">False</property>
1626 - <property name="label" translatable="yes"><b>Etched out</b></property>
1627 - <property name="use_markup">True</property>
1628 - </object>
1629 - </child>
1630 - </object>
1631 - <packing>
1632 - <property name="expand">True</property>
1633 - <property name="fill">True</property>
1634 - <property name="position">3</property>
1635 - </packing>
1636 - </child>
1637 - </object>
1638 - <packing>
1639 - <property name="expand">True</property>
1640 - <property name="fill">True</property>
1641 - <property name="position">6</property>
1642 - </packing>
1643 - </child>
1644 - <child>
1645 - <object class="GtkSeparator" id="separator4">
1646 - <property name="visible">True</property>
1647 - <property name="can_focus">False</property>
1648 - <property name="orientation">vertical</property>
1649 - </object>
1650 - <packing>
1651 - <property name="expand">False</property>
1652 - <property name="fill">True</property>
1653 - <property name="position">7</property>
1654 - </packing>
1655 - </child>
1656 - <child>
1657 - <object class="GtkBox" id="box4">
1658 - <property name="visible">True</property>
1659 - <property name="can_focus">False</property>
1660 - <property name="orientation">vertical</property>
1661 - <property name="spacing">4</property>
1662 - <child>
1663 - <object class="GtkScrolledWindow" id="scrolledwindow1">
1664 - <property name="width_request">150</property>
1665 - <property name="visible">True</property>
1666 - <property name="can_focus">True</property>
1667 - <property name="vscrollbar_policy">always</property>
1668 - <property name="shadow_type">in</property>
1669 - <child>
1670 - <object class="GtkTreeView" id="treeview1">
1671 - <property name="visible">True</property>
1672 - <property name="can_focus">True</property>
1673 - <property name="model">liststore1</property>
1674 - <property name="headers_clickable">False</property>
1675 - <property name="search_column">0</property>
1676 - <child internal-child="selection">
1677 - <object class="GtkTreeSelection" id="treeview-selection"/>
1678 - </child>
1679 - <child>
1680 - <object class="GtkTreeViewColumn" id="treeviewcolumn3">
1681 - <property name="title" translatable="yes">Cool</property>
1682 - <child>
1683 - <object class="GtkCellRendererToggle" id="cellrenderertoggle1"/>
1684 - <attributes>
1685 - <attribute name="active">0</attribute>
1686 - </attributes>
1687 - </child>
1688 - </object>
1689 - </child>
1690 - <child>
1691 - <object class="GtkTreeViewColumn" id="treeviewcolumn1">
1692 - <property name="title" translatable="yes">Name</property>
1693 - <child>
1694 - <object class="GtkCellRendererText" id="cellrenderertext3"/>
1695 - <attributes>
1696 - <attribute name="text">1</attribute>
1697 - </attributes>
1698 - </child>
1699 - </object>
1700 - </child>
1701 - <child>
1702 - <object class="GtkTreeViewColumn" id="treeviewcolumn2">
1703 - <property name="title" translatable="yes">Nick</property>
1704 - <child>
1705 - <object class="GtkCellRendererText" id="cellrenderertext4"/>
1706 - <attributes>
1707 - <attribute name="text">2</attribute>
1708 - </attributes>
1709 - </child>
1710 - </object>
1711 - </child>
1712 - </object>
1713 - </child>
1714 - </object>
1715 - <packing>
1716 - <property name="expand">True</property>
1717 - <property name="fill">True</property>
1718 - <property name="position">0</property>
1719 - </packing>
1720 - </child>
1721 - <child>
1722 - <object class="GtkScrolledWindow" id="scrolledwindow2">
1723 - <property name="visible">True</property>
1724 - <property name="can_focus">True</property>
1725 - <property name="shadow_type">in</property>
1726 - <child>
1727 - <object class="GtkTextView" id="textview1">
1728 - <property name="visible">True</property>
1729 - <property name="can_focus">True</property>
1730 - <property name="buffer">textbuffer1</property>
1731 - </object>
1732 - </child>
1733 - </object>
1734 - <packing>
1735 - <property name="expand">True</property>
1736 - <property name="fill">True</property>
1737 - <property name="position">1</property>
1738 - </packing>
1739 - </child>
1740 - </object>
1741 - <packing>
1742 - <property name="expand">True</property>
1743 - <property name="fill">True</property>
1744 - <property name="padding">6</property>
1745 - <property name="position">8</property>
1746 - </packing>
1747 - </child>
1748 - </object>
1749 - <packing>
1750 - <property name="expand">False</property>
1751 - <property name="fill">True</property>
1752 - <property name="padding">10</property>
1753 - <property name="position">2</property>
1754 - </packing>
1755 - </child>
1756 - <child>
1757 - <object class="GtkSeparator" id="separator5">
1758 - <property name="visible">True</property>
1759 - <property name="can_focus">False</property>
1760 - </object>
1761 - <packing>
1762 - <property name="expand">False</property>
1763 - <property name="fill">True</property>
1764 - <property name="position">3</property>
1765 - </packing>
1766 - </child>
1767 - <child>
1768 - <object class="GtkBox" id="box5">
1769 - <property name="visible">True</property>
1770 - <property name="can_focus">False</property>
1771 - <property name="margin_left">5</property>
1772 - <property name="margin_right">5</property>
1773 - <property name="margin_bottom">5</property>
1774 - <property name="spacing">10</property>
1775 - <property name="homogeneous">True</property>
1776 - <child>
1777 - <object class="GtkNotebook" id="notebook1">
1778 - <property name="visible">True</property>
1779 - <property name="can_focus">True</property>
1780 - <child>
1781 - <object class="GtkBox" id="box6">
1782 - <property name="visible">True</property>
1783 - <property name="can_focus">False</property>
1784 - <property name="orientation">vertical</property>
1785 - <child>
1786 - <placeholder/>
1787 - </child>
1788 - </object>
1789 - </child>
1790 - <child type="tab">
1791 - <object class="GtkLabel" id="label5">
1792 - <property name="visible">True</property>
1793 - <property name="can_focus">False</property>
1794 - <property name="label" translatable="yes">page 1</property>
1795 - </object>
1796 - <packing>
1797 - <property name="tab_fill">False</property>
1798 - </packing>
1799 - </child>
1800 - <child>
1801 - <object class="GtkBox" id="box7">
1802 - <property name="visible">True</property>
1803 - <property name="can_focus">False</property>
1804 - <property name="orientation">vertical</property>
1805 - <child>
1806 - <placeholder/>
1807 - </child>
1808 - </object>
1809 - <packing>
1810 - <property name="position">1</property>
1811 - </packing>
1812 - </child>
1813 - <child type="tab">
1814 - <object class="GtkLabel" id="label6">
1815 - <property name="visible">True</property>
1816 - <property name="can_focus">False</property>
1817 - <property name="label" translatable="yes">page 2</property>
1818 - </object>
1819 - <packing>
1820 - <property name="position">1</property>
1821 - <property name="tab_fill">False</property>
1822 - </packing>
1823 - </child>
1824 - <child>
1825 - <object class="GtkBox" id="box8">
1826 - <property name="visible">True</property>
1827 - <property name="can_focus">False</property>
1828 - <property name="orientation">vertical</property>
1829 - <child>
1830 - <placeholder/>
1831 - </child>
1832 - </object>
1833 - <packing>
1834 - <property name="position">2</property>
1835 - </packing>
1836 - </child>
1837 - <child type="tab">
1838 - <object class="GtkLabel" id="label7">
1839 - <property name="visible">True</property>
1840 - <property name="can_focus">False</property>
1841 - <property name="label" translatable="yes">page 3</property>
1842 - </object>
1843 - <packing>
1844 - <property name="position">2</property>
1845 - <property name="tab_fill">False</property>
1846 - </packing>
1847 - </child>
1848 - </object>
1849 - <packing>
1850 - <property name="expand">False</property>
1851 - <property name="fill">True</property>
1852 - <property name="position">0</property>
1853 - </packing>
1854 - </child>
1855 - <child>
1856 - <object class="GtkNotebook" id="notebook2">
1857 - <property name="visible">True</property>
1858 - <property name="can_focus">True</property>
1859 - <property name="tab_pos">right</property>
1860 - <child>
1861 - <object class="GtkBox" id="box9">
1862 - <property name="visible">True</property>
1863 - <property name="can_focus">False</property>
1864 - <property name="orientation">vertical</property>
1865 - <child>
1866 - <placeholder/>
1867 - </child>
1868 - </object>
1869 - </child>
1870 - <child type="tab">
1871 - <object class="GtkLabel" id="label8">
1872 - <property name="visible">True</property>
1873 - <property name="can_focus">False</property>
1874 - <property name="label" translatable="yes">page 1</property>
1875 - </object>
1876 - <packing>
1877 - <property name="tab_fill">False</property>
1878 - </packing>
1879 - </child>
1880 - <child>
1881 - <object class="GtkBox" id="box10">
1882 - <property name="visible">True</property>
1883 - <property name="can_focus">False</property>
1884 - <property name="orientation">vertical</property>
1885 - <child>
1886 - <placeholder/>
1887 - </child>
1888 - </object>
1889 - <packing>
1890 - <property name="position">1</property>
1891 - </packing>
1892 - </child>
1893 - <child type="tab">
1894 - <object class="GtkLabel" id="label9">
1895 - <property name="visible">True</property>
1896 - <property name="can_focus">False</property>
1897 - <property name="label" translatable="yes">page 2</property>
1898 - </object>
1899 - <packing>
1900 - <property name="position">1</property>
1901 - <property name="tab_fill">False</property>
1902 - </packing>
1903 - </child>
1904 - <child>
1905 - <object class="GtkBox" id="box11">
1906 - <property name="visible">True</property>
1907 - <property name="can_focus">False</property>
1908 - <property name="orientation">vertical</property>
1909 - <child>
1910 - <placeholder/>
1911 - </child>
1912 - </object>
1913 - <packing>
1914 - <property name="position">2</property>
1915 - </packing>
1916 - </child>
1917 - <child type="tab">
1918 - <object class="GtkLabel" id="label10">
1919 - <property name="visible">True</property>
1920 - <property name="can_focus">False</property>
1921 - <property name="label" translatable="yes">page 3</property>
1922 - </object>
1923 - <packing>
1924 - <property name="position">2</property>
1925 - <property name="tab_fill">False</property>
1926 - </packing>
1927 - </child>
1928 - </object>
1929 - <packing>
1930 - <property name="expand">False</property>
1931 - <property name="fill">True</property>
1932 - <property name="position">1</property>
1933 - </packing>
1934 - </child>
1935 - <child>
1936 - <object class="GtkNotebook" id="notebook3">
1937 - <property name="visible">True</property>
1938 - <property name="can_focus">True</property>
1939 - <property name="tab_pos">bottom</property>
1940 - <child>
1941 - <object class="GtkBox" id="box12">
1942 - <property name="visible">True</property>
1943 - <property name="can_focus">False</property>
1944 - <property name="orientation">vertical</property>
1945 - <child>
1946 - <placeholder/>
1947 - </child>
1948 - </object>
1949 - </child>
1950 - <child type="tab">
1951 - <object class="GtkLabel" id="label11">
1952 - <property name="visible">True</property>
1953 - <property name="can_focus">False</property>
1954 - <property name="label" translatable="yes">page 1</property>
1955 - </object>
1956 - <packing>
1957 - <property name="tab_fill">False</property>
1958 - </packing>
1959 - </child>
1960 - <child>
1961 - <object class="GtkBox" id="box13">
1962 - <property name="visible">True</property>
1963 - <property name="can_focus">False</property>
1964 - <property name="orientation">vertical</property>
1965 - <child>
1966 - <placeholder/>
1967 - </child>
1968 - </object>
1969 - <packing>
1970 - <property name="position">1</property>
1971 - </packing>
1972 - </child>
1973 - <child type="tab">
1974 - <object class="GtkLabel" id="label12">
1975 - <property name="visible">True</property>
1976 - <property name="can_focus">False</property>
1977 - <property name="label" translatable="yes">page 2</property>
1978 - </object>
1979 - <packing>
1980 - <property name="position">1</property>
1981 - <property name="tab_fill">False</property>
1982 - </packing>
1983 - </child>
1984 - <child>
1985 - <object class="GtkBox" id="box14">
1986 - <property name="visible">True</property>
1987 - <property name="can_focus">False</property>
1988 - <property name="orientation">vertical</property>
1989 - <child>
1990 - <placeholder/>
1991 - </child>
1992 - </object>
1993 - <packing>
1994 - <property name="position">2</property>
1995 - </packing>
1996 - </child>
1997 - <child type="tab">
1998 - <object class="GtkLabel" id="label13">
1999 - <property name="visible">True</property>
2000 - <property name="can_focus">False</property>
2001 - <property name="label" translatable="yes">page 3</property>
2002 - </object>
2003 - <packing>
2004 - <property name="position">2</property>
2005 - <property name="tab_fill">False</property>
2006 - </packing>
2007 - </child>
2008 - </object>
2009 - <packing>
2010 - <property name="expand">False</property>
2011 - <property name="fill">True</property>
2012 - <property name="position">2</property>
2013 - </packing>
2014 - </child>
2015 - <child>
2016 - <object class="GtkNotebook" id="notebook4">
2017 - <property name="visible">True</property>
2018 - <property name="can_focus">True</property>
2019 - <property name="tab_pos">left</property>
2020 - <child>
2021 - <object class="GtkBox" id="box15">
2022 - <property name="visible">True</property>
2023 - <property name="can_focus">False</property>
2024 - <property name="orientation">vertical</property>
2025 - <child>
2026 - <placeholder/>
2027 - </child>
2028 - </object>
2029 - </child>
2030 - <child type="tab">
2031 - <object class="GtkLabel" id="label14">
2032 - <property name="visible">True</property>
2033 - <property name="can_focus">False</property>
2034 - <property name="label" translatable="yes">page 1</property>
2035 - </object>
2036 - <packing>
2037 - <property name="tab_fill">False</property>
2038 - </packing>
2039 - </child>
2040 - <child>
2041 - <object class="GtkBox" id="box16">
2042 - <property name="visible">True</property>
2043 - <property name="can_focus">False</property>
2044 - <property name="orientation">vertical</property>
2045 - <child>
2046 - <placeholder/>
2047 - </child>
2048 - </object>
2049 - <packing>
2050 - <property name="position">1</property>
2051 - </packing>
2052 - </child>
2053 - <child type="tab">
2054 - <object class="GtkLabel" id="label15">
2055 - <property name="visible">True</property>
2056 - <property name="can_focus">False</property>
2057 - <property name="label" translatable="yes">page 2</property>
2058 - </object>
2059 - <packing>
2060 - <property name="position">1</property>
2061 - <property name="tab_fill">False</property>
2062 - </packing>
2063 - </child>
2064 - <child>
2065 - <object class="GtkBox" id="box17">
2066 - <property name="visible">True</property>
2067 - <property name="can_focus">False</property>
2068 - <property name="orientation">vertical</property>
2069 - <child>
2070 - <placeholder/>
2071 - </child>
2072 - </object>
2073 - <packing>
2074 - <property name="position">2</property>
2075 - </packing>
2076 - </child>
2077 - <child type="tab">
2078 - <object class="GtkLabel" id="label16">
2079 - <property name="visible">True</property>
2080 - <property name="can_focus">False</property>
2081 - <property name="label" translatable="yes">page 3</property>
2082 - </object>
2083 - <packing>
2084 - <property name="position">2</property>
2085 - <property name="tab_fill">False</property>
2086 - </packing>
2087 - </child>
2088 - </object>
2089 - <packing>
2090 - <property name="expand">False</property>
2091 - <property name="fill">True</property>
2092 - <property name="position">3</property>
2093 - </packing>
2094 - </child>
2095 - </object>
2096 - <packing>
2097 - <property name="expand">True</property>
2098 - <property name="fill">True</property>
2099 - <property name="position">4</property>
2100 - </packing>
2101 - </child>
2102 - <child>
2103 - <object class="GtkStatusbar" id="statusbar1">
2104 - <property name="visible">True</property>
2105 - <property name="can_focus">False</property>
2106 - </object>
2107 - <packing>
2108 - <property name="expand">False</property>
2109 - <property name="fill">True</property>
2110 - <property name="position">5</property>
2111 - </packing>
2112 - </child>
2113 - </object>
2114 - </child>
2115 - </object>
2116 -</interface>
2118 === modified file 'unico/Makefile.am'
2119 --- unico/Makefile.am 2011-07-28 09:12:33 +0000
2120 +++ unico/Makefile.am 2016-01-19 12:14:18 +0000
2121 @@ -1,8 +1,5 @@
2122 source_h = \
2123 $(srcdir)/unico.h \
2124 - $(srcdir)/exponential-blur.h \
2125 - $(srcdir)/gtkroundedboxprivate.h \
2126 - $(srcdir)/raico-blur.h \
2127 $(srcdir)/unico-cairo-support.h \
2128 $(srcdir)/unico-draw.h \
2129 $(srcdir)/unico-engine.h \
2130 @@ -10,9 +7,6 @@
2131 $(srcdir)/unico-types.h
2133 source_c = \
2134 - $(srcdir)/exponential-blur.c \
2135 - $(srcdir)/gtkroundedbox.c \
2136 - $(srcdir)/raico-blur.c \
2137 $(srcdir)/unico-cairo-support.c \
2138 $(srcdir)/unico-draw.c \
2139 $(srcdir)/unico-engine.c \
2141 === removed file 'unico/exponential-blur.c'
2142 --- unico/exponential-blur.c 2011-07-13 10:21:30 +0000
2143 +++ unico/exponential-blur.c 1970-01-01 00:00:00 +0000
2144 @@ -1,288 +0,0 @@
2145 -/* The Unico Theming Engine for Gtk+.
2146 - * Copyright (C) 2009 Canonical Ltd
2147 - *
2148 - * This library is free software; you can redistribute it and/or
2149 - * modify it under the terms of the GNU Lesser General Public
2150 - * License as published by the Free Software Foundation; either
2151 - * version 2 of the License, or (at your option) any later version.
2152 - *
2153 - * This library is distributed in the hope that it will be useful,
2154 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2155 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2156 - * Lesser General Public License for more details.
2157 - *
2158 - * You should have received a copy of the GNU Lesser General Public
2159 - * License along with this library; if not, write to the Free
2160 - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
2161 - * MA 02110-1301, USA.
2162 - *
2163 - * Authored by Mirco "MacSlow" Mueller <mirco.mueller@canonical.com>
2164 - *
2165 - * Notes:
2166 - * based on exponential-blur algorithm by Jani Huhtanen
2167 - *
2168 - */
2169 -
2170 -/* FIXME: not working yet, unfinished */
2171 -
2172 -#include <math.h>
2173 -
2174 -#include "exponential-blur.h"
2175 -
2176 -static inline void
2177 -_blurinner (guchar* pixel,
2178 - gint *zR,
2179 - gint *zG,
2180 - gint *zB,
2181 - gint *zA,
2182 - gint alpha,
2183 - gint aprec,
2184 - gint zprec);
2185 -
2186 -static inline void
2187 -_blurrow (guchar* pixels,
2188 - gint width,
2189 - gint height,
2190 - gint channels,
2191 - gint line,
2192 - gint alpha,
2193 - gint aprec,
2194 - gint zprec);
2195 -
2196 -static inline void
2197 -_blurcol (guchar* pixels,
2198 - gint width,
2199 - gint height,
2200 - gint channels,
2201 - gint col,
2202 - gint alpha,
2203 - gint aprec,
2204 - gint zprec);
2205 -
2206 -void
2207 -_expblur (guchar* pixels,
2208 - gint width,
2209 - gint height,
2210 - gint channels,
2211 - gint radius,
2212 - gint aprec,
2213 - gint zprec);
2214 -
2215 -void
2216 -surface_exponential_blur (cairo_surface_t* surface,
2217 - guint radius)
2218 -{
2219 - guchar* pixels;
2220 - guint width;
2221 - guint height;
2222 - cairo_format_t format;
2223 -
2224 - /* sanity checks are done in raico-blur.c */
2225 -
2226 - /* before we mess with the surface execute any pending drawing */
2227 - cairo_surface_flush (surface);
2228 -
2229 - pixels = cairo_image_surface_get_data (surface);
2230 - width = cairo_image_surface_get_width (surface);
2231 - height = cairo_image_surface_get_height (surface);
2232 - format = cairo_image_surface_get_format (surface);
2233 -
2234 - switch (format)
2235 - {
2236 - case CAIRO_FORMAT_ARGB32:
2237 - _expblur (pixels, width, height, 4, radius, 16, 7);
2238 - break;
2239 - case CAIRO_FORMAT_RGB24:
2240 - _expblur (pixels, width, height, 3, radius, 16, 7);
2241 - break;
2242 - case CAIRO_FORMAT_A8:
2243 - _expblur (pixels, width, height, 1, radius, 16, 7);
2244 - break;
2245 - default:
2246 - break;
2247 - }
2248 -
2249 - /* inform cairo we altered the surfaces contents */
2250 - cairo_surface_mark_dirty (surface);
2251 -}
2252 -
2253 -/*
2254 - * pixels image-data
2255 - * width image-width
2256 - * height image-height
2257 - * channels image-channels
2258 - *
2259 - * in-place blur of image 'img' with kernel of approximate radius 'radius'
2260 - *
2261 - * blurs with two sided exponential impulse response
2262 - *
2263 - * aprec = precision of alpha parameter in fixed-point format 0.aprec
2264 - *
2265 - * zprec = precision of state parameters zR,zG,zB and zA in fp format 8.zprec
2266 - */
2267 -void
2268 -_expblur (guchar* pixels,
2269 - gint width,
2270 - gint height,
2271 - gint channels,
2272 - gint radius,
2273 - gint aprec,
2274 - gint zprec)
2275 -{
2276 - gint alpha;
2277 - gint row = 0;
2278 - gint col = 0;
2279 -
2280 - if (radius < 1)
2281 - return;
2282 -
2283 - /* calculate the alpha such that 90% of
2284 - * the kernel is within the radius.
2285 - * (Kernel extends to infinity) */
2286 - alpha = (gint) ((1 << aprec) * (1.0f - expf (-2.3f / (radius + 1.f))));
2287 -
2288 - for (; row < height; row++)
2289 - _blurrow (pixels,
2290 - width,
2291 - height,
2292 - channels,
2293 - row,
2294 - alpha,
2295 - aprec,
2296 - zprec);
2297 -
2298 - for(; col < width; col++)
2299 - _blurcol (pixels,
2300 - width,
2301 - height,
2302 - channels,
2303 - col,
2304 - alpha,
2305 - aprec,
2306 - zprec);
2307 -
2308 - return;
2309 -}
2310 -
2311 -static inline void
2312 -_blurinner (guchar* pixel,
2313 - gint *zR,
2314 - gint *zG,
2315 - gint *zB,
2316 - gint *zA,
2317 - gint alpha,
2318 - gint aprec,
2319 - gint zprec)
2320 -{
2321 - gint R;
2322 - gint G;
2323 - gint B;
2324 - guchar A;
2325 -
2326 - R = *pixel;
2327 - G = *(pixel + 1);
2328 - B = *(pixel + 2);
2329 - A = *(pixel + 3);
2330 -
2331 - *zR += (alpha * ((R << zprec) - *zR)) >> aprec;
2332 - *zG += (alpha * ((G << zprec) - *zG)) >> aprec;
2333 - *zB += (alpha * ((B << zprec) - *zB)) >> aprec;
2334 - *zA += (alpha * ((A << zprec) - *zA)) >> aprec;
2335 -
2336 - *pixel = *zR >> zprec;
2337 - *(pixel + 1) = *zG >> zprec;
2338 - *(pixel + 2) = *zB >> zprec;
2339 - *(pixel + 3) = *zA >> zprec;
2340 -}
2341 -
2342 -static inline void
2343 -_blurrow (guchar* pixels,
2344 - gint width,
2345 - gint height,
2346 - gint channels,
2347 - gint line,
2348 - gint alpha,
2349 - gint aprec,
2350 - gint zprec)
2351 -{
2352 - gint zR;
2353 - gint zG;
2354 - gint zB;
2355 - gint zA;
2356 - gint index;
2357 - guchar* scanline;
2358 -
2359 - scanline = &(pixels[line * width * channels]);
2360 -
2361 - zR = *scanline << zprec;
2362 - zG = *(scanline + 1) << zprec;
2363 - zB = *(scanline + 2) << zprec;
2364 - zA = *(scanline + 3) << zprec;
2365 -
2366 - for (index = 0; index < width; index ++)
2367 - _blurinner (&scanline[index * channels],
2368 - &zR,
2369 - &zG,
2370 - &zB,
2371 - &zA,
2372 - alpha,
2373 - aprec,
2374 - zprec);
2375 -
2376 - for (index = width - 2; index >= 0; index--)
2377 - _blurinner (&scanline[index * channels],
2378 - &zR,
2379 - &zG,
2380 - &zB,
2381 - &zA,
2382 - alpha,
2383 - aprec,
2384 - zprec);
2385 -}
2386 -
2387 -static inline void
2388 -_blurcol (guchar* pixels,
2389 - gint width,
2390 - gint height,
2391 - gint channels,
2392 - gint x,
2393 - gint alpha,
2394 - gint aprec,
2395 - gint zprec)
2396 -{
2397 - gint zR;
2398 - gint zG;
2399 - gint zB;
2400 - gint zA;
2401 - gint index;
2402 - guchar* ptr;
2403 -
2404 - ptr = pixels;
2405 -
2406 - ptr += x * channels;
2407 -
2408 - zR = *((guchar*) ptr ) << zprec;
2409 - zG = *((guchar*) ptr + 1) << zprec;
2410 - zB = *((guchar*) ptr + 2) << zprec;
2411 - zA = *((guchar*) ptr + 3) << zprec;
2412 -
2413 - for (index = width; index < (height - 1) * width; index += width)
2414 - _blurinner ((guchar*) &ptr[index * channels],
2415 - &zR,
2416 - &zG,
2417 - &zB,
2418 - &zA,
2419 - alpha,
2420 - aprec,
2421 - zprec);
2422 -
2423 - for (index = (height - 2) * width; index >= 0; index -= width)
2424 - _blurinner ((guchar*) &ptr[index * channels],
2425 - &zR,
2426 - &zG,
2427 - &zB,
2428 - &zA,
2429 - alpha,
2430 - aprec,
2431 - zprec);
2432 -}
2434 === removed file 'unico/exponential-blur.h'
2435 --- unico/exponential-blur.h 2011-08-09 22:26:09 +0000
2436 +++ unico/exponential-blur.h 1970-01-01 00:00:00 +0000
2437 @@ -1,37 +0,0 @@
2438 -/* The Unico Theming Engine for Gtk+.
2439 - * Copyright (C) 2009 Canonical Ltd
2440 - *
2441 - * This library is free software; you can redistribute it and/or
2442 - * modify it under the terms of the GNU Lesser General Public
2443 - * License as published by the Free Software Foundation; either
2444 - * version 2 of the License, or (at your option) any later version.
2445 - *
2446 - * This library is distributed in the hope that it will be useful,
2447 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2448 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2449 - * Lesser General Public License for more details.
2450 - *
2451 - * You should have received a copy of the GNU Lesser General Public
2452 - * License along with this library; if not, write to the Free
2453 - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
2454 - * MA 02110-1301, USA.
2455 - *
2456 - * Authored by Mirco "MacSlow" Mueller <mirco.mueller@canonical.com>
2457 - *
2458 - * Notes:
2459 - * based on exponential-blur algorithm by Jani Huhtanen
2460 - *
2461 - */
2462 -
2463 -#ifndef _EXPONENTIAL_BLUR_H
2464 -#define _EXPONENTIAL_BLUR_H
2465 -
2466 -#include <cairo.h>
2467 -#include <glib.h>
2468 -
2469 -void
2470 -surface_exponential_blur (cairo_surface_t* surface,
2471 - guint radius);
2472 -
2473 -#endif // _EXPONENTIAL_BLUR_H
2474 -
2476 === removed file 'unico/gtkroundedbox.c'
2477 --- unico/gtkroundedbox.c 2012-02-08 12:54:39 +0000
2478 +++ unico/gtkroundedbox.c 1970-01-01 00:00:00 +0000
2479 @@ -1,527 +0,0 @@
2480 -/* GTK - The GIMP Toolkit
2481 - * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
2482 - *
2483 - * This library is free software; you can redistribute it and/or
2484 - * modify it under the terms of the GNU Lesser General Public
2485 - * License as published by the Free Software Foundation; either
2486 - * version 2 of the License, or (at your option) any later version.
2487 - *
2488 - * This library is distributed in the hope that it will be useful,
2489 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
2490 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
2491 - * Lesser General Public License for more details.
2492 - *
2493 - * You should have received a copy of the GNU Lesser General Public
2494 - * License along with this library; if not, write to the
2495 - * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
2496 - * Boston, MA 02111-1307, USA.
2497 - */
2498 -
2499 -#include <string.h>
2500 -#include <cairo.h>
2501 -
2502 -#include "gtkroundedboxprivate.h"
2503 -
2504 -double
2505 -_gtk_css_number_get (const GtkCssNumber *number,
2506 - double one_hundred_percent)
2507 -{
2508 - if (number->unit == GTK_CSS_PERCENT)
2509 - return number->value * one_hundred_percent * 0.01;
2510 - else
2511 - return number->value;
2512 -}
2513 -
2514 -/**
2515 - * _gtk_rounded_box_init_rect:
2516 - * @box: box to initialize
2517 - * @x: x coordinate of box
2518 - * @y: y coordinate of box
2519 - * @width: width of box
2520 - * @height: height of box
2521 - *
2522 - * Initializes the given @box to represent the given rectangle.
2523 - * The
2524 - **/
2525 -void
2526 -_gtk_rounded_box_init_rect (GtkRoundedBox *box,
2527 - double x,
2528 - double y,
2529 - double width,
2530 - double height)
2531 -{
2532 - memset (box, 0, sizeof (GtkRoundedBox));
2533 -
2534 - box->box.x = x;
2535 - box->box.y = y;
2536 - box->box.width = width;
2537 - box->box.height = height;
2538 -}
2539 -
2540 -/* clamp border radius, following CSS specs */
2541 -static void
2542 -gtk_rounded_box_clamp_border_radius (GtkRoundedBox *box)
2543 -{
2544 - gdouble factor = 1.0;
2545 -
2546 - /* note: division by zero leads to +INF, which is > factor, so will be ignored */
2547 - factor = MIN (factor, box->box.width / (box->corner[GTK_CSS_TOP_LEFT].horizontal +
2548 - box->corner[GTK_CSS_TOP_RIGHT].horizontal));
2549 - factor = MIN (factor, box->box.height / (box->corner[GTK_CSS_TOP_RIGHT].vertical +
2550 - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical));
2551 - factor = MIN (factor, box->box.width / (box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal +
2552 - box->corner[GTK_CSS_BOTTOM_LEFT].horizontal));
2553 - factor = MIN (factor, box->box.height / (box->corner[GTK_CSS_TOP_LEFT].vertical +
2554 - box->corner[GTK_CSS_BOTTOM_LEFT].vertical));
2555 -
2556 - box->corner[GTK_CSS_TOP_LEFT].horizontal *= factor;
2557 - box->corner[GTK_CSS_TOP_LEFT].vertical *= factor;
2558 - box->corner[GTK_CSS_TOP_RIGHT].horizontal *= factor;
2559 - box->corner[GTK_CSS_TOP_RIGHT].vertical *= factor;
2560 - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal *= factor;
2561 - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical *= factor;
2562 - box->corner[GTK_CSS_BOTTOM_LEFT].horizontal *= factor;
2563 - box->corner[GTK_CSS_BOTTOM_LEFT].vertical *= factor;
2564 -}
2565 -
2566 -void
2567 -_gtk_rounded_box_apply_border_radius (GtkRoundedBox *box,
2568 - GtkThemingEngine *engine,
2569 - GtkStateFlags state,
2570 - GtkJunctionSides junction)
2571 -{
2572 - GtkCssBorderCornerRadius *corner[4];
2573 - guint i;
2574 -
2575 - gtk_theming_engine_get (engine, state,
2576 - /* Can't use border-radius as it's an int for
2577 - * backwards compat */
2578 - "border-top-left-radius", &corner[GTK_CSS_TOP_LEFT],
2579 - "border-top-right-radius", &corner[GTK_CSS_TOP_RIGHT],
2580 - "border-bottom-right-radius", &corner[GTK_CSS_BOTTOM_RIGHT],
2581 - "border-bottom-left-radius", &corner[GTK_CSS_BOTTOM_LEFT],
2582 - NULL);
2583 -
2584 - if (corner[GTK_CSS_TOP_LEFT] && (junction & GTK_JUNCTION_CORNER_TOPLEFT) == 0)
2585 - {
2586 - box->corner[GTK_CSS_TOP_LEFT].horizontal = _gtk_css_number_get (&corner[GTK_CSS_TOP_LEFT]->horizontal,
2587 - box->box.width);
2588 - box->corner[GTK_CSS_TOP_LEFT].vertical = _gtk_css_number_get (&corner[GTK_CSS_TOP_LEFT]->vertical,
2589 - box->box.height);
2590 - }
2591 - if (corner[GTK_CSS_TOP_RIGHT] && (junction & GTK_JUNCTION_CORNER_TOPRIGHT) == 0)
2592 - {
2593 - box->corner[GTK_CSS_TOP_RIGHT].horizontal = _gtk_css_number_get (&corner[GTK_CSS_TOP_RIGHT]->horizontal,
2594 - box->box.width);
2595 - box->corner[GTK_CSS_TOP_RIGHT].vertical = _gtk_css_number_get (&corner[GTK_CSS_TOP_RIGHT]->vertical,
2596 - box->box.height);
2597 - }
2598 - if (corner[GTK_CSS_BOTTOM_RIGHT] && (junction & GTK_JUNCTION_CORNER_BOTTOMRIGHT) == 0)
2599 - {
2600 - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal = _gtk_css_number_get (&corner[GTK_CSS_BOTTOM_RIGHT]->horizontal,
2601 - box->box.width);
2602 - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical = _gtk_css_number_get (&corner[GTK_CSS_BOTTOM_RIGHT]->vertical,
2603 - box->box.height);
2604 - }
2605 - if (corner[GTK_CSS_BOTTOM_LEFT] && (junction & GTK_JUNCTION_CORNER_BOTTOMLEFT) == 0)
2606 - {
2607 - box->corner[GTK_CSS_BOTTOM_LEFT].horizontal = _gtk_css_number_get (&corner[GTK_CSS_BOTTOM_LEFT]->horizontal,
2608 - box->box.width);
2609 - box->corner[GTK_CSS_BOTTOM_LEFT].vertical = _gtk_css_number_get (&corner[GTK_CSS_BOTTOM_LEFT]->vertical,
2610 - box->box.height);
2611 - }
2612 -
2613 - gtk_rounded_box_clamp_border_radius (box);
2614 -
2615 - for (i = 0; i < 4; i++)
2616 - g_free (corner[i]);
2617 -}
2618 -
2619 -static void
2620 -gtk_css_border_radius_grow (GtkRoundedBoxCorner *corner,
2621 - double horizontal,
2622 - double vertical)
2623 -{
2624 - corner->horizontal += horizontal;
2625 - corner->vertical += vertical;
2626 -
2627 - if (corner->horizontal <= 0 || corner->vertical <= 0)
2628 - {
2629 - corner->horizontal = 0;
2630 - corner->vertical = 0;
2631 - }
2632 -}
2633 -void
2634 -_gtk_rounded_box_grow (GtkRoundedBox *box,
2635 - double top,
2636 - double right,
2637 - double bottom,
2638 - double left)
2639 -{
2640 - if (box->box.width + left + right < 0)
2641 - {
2642 - box->box.x -= left * box->box.width / (left + right);
2643 - box->box.width = 0;
2644 - }
2645 - else
2646 - {
2647 - box->box.x -= left;
2648 - box->box.width += left + right;
2649 - }
2650 -
2651 - if (box->box.height + bottom + right < 0)
2652 - {
2653 - box->box.y -= top * box->box.height / (top + bottom);
2654 - box->box.height = 0;
2655 - }
2656 - else
2657 - {
2658 - box->box.y -= top;
2659 - box->box.height += top + bottom;
2660 - }
2661 -
2662 - gtk_css_border_radius_grow (&box->corner[GTK_CSS_TOP_LEFT], left, top);
2663 - gtk_css_border_radius_grow (&box->corner[GTK_CSS_TOP_RIGHT], right, bottom);
2664 - gtk_css_border_radius_grow (&box->corner[GTK_CSS_BOTTOM_RIGHT], right, top);
2665 - gtk_css_border_radius_grow (&box->corner[GTK_CSS_BOTTOM_LEFT], left, bottom);
2666 -}
2667 -
2668 -void
2669 -_gtk_rounded_box_shrink (GtkRoundedBox *box,
2670 - double top,
2671 - double right,
2672 - double bottom,
2673 - double left)
2674 -{
2675 - _gtk_rounded_box_grow (box, -top, -right, -bottom, -left);
2676 -}
2677 -
2678 -void
2679 -_gtk_rounded_box_move (GtkRoundedBox *box,
2680 - double dx,
2681 - double dy)
2682 -{
2683 - box->box.x += dx;
2684 - box->box.y += dy;
2685 -}
2686 -
2687 -static void
2688 -_cairo_ellipsis (cairo_t *cr,
2689 - double xc, double yc,
2690 - double xradius, double yradius,
2691 - double angle1, double angle2)
2692 -{
2693 - if (xradius <= 0.0 || yradius <= 0.0)
2694 - {
2695 - cairo_line_to (cr, xc, yc);
2696 - return;
2697 - }
2698 -
2699 - cairo_save (cr);
2700 - cairo_translate (cr, xc, yc);
2701 - cairo_scale (cr, xradius, yradius);
2702 - cairo_arc (cr, 0, 0, 1.0, angle1, angle2);
2703 - cairo_restore (cr);
2704 -}
2705 -
2706 -static void
2707 -_cairo_ellipsis_negative (cairo_t *cr,
2708 - double xc, double yc,
2709 - double xradius, double yradius,
2710 - double angle1, double angle2)
2711 -{
2712 - if (xradius <= 0.0 || yradius <= 0.0)
2713 - {
2714 - cairo_line_to (cr, xc, yc);
2715 - return;
2716 - }
2717 -
2718 - cairo_save (cr);
2719 - cairo_translate (cr, xc, yc);
2720 - cairo_scale (cr, xradius, yradius);
2721 - cairo_arc_negative (cr, 0, 0, 1.0, angle1, angle2);
2722 - cairo_restore (cr);
2723 -}
2724 -
2725 -void
2726 -_gtk_rounded_box_path (const GtkRoundedBox *box,
2727 - cairo_t *cr)
2728 -{
2729 - cairo_new_sub_path (cr);
2730 -
2731 - _cairo_ellipsis (cr,
2732 - box->box.x + box->corner[GTK_CSS_TOP_LEFT].horizontal,
2733 - box->box.y + box->corner[GTK_CSS_TOP_LEFT].vertical,
2734 - box->corner[GTK_CSS_TOP_LEFT].horizontal,
2735 - box->corner[GTK_CSS_TOP_LEFT].vertical,
2736 - G_PI, 3 * G_PI / 2);
2737 - _cairo_ellipsis (cr,
2738 - box->box.x + box->box.width - box->corner[GTK_CSS_TOP_RIGHT].horizontal,
2739 - box->box.y + box->corner[GTK_CSS_TOP_RIGHT].vertical,
2740 - box->corner[GTK_CSS_TOP_RIGHT].horizontal,
2741 - box->corner[GTK_CSS_TOP_RIGHT].vertical,
2742 - - G_PI / 2, 0);
2743 - _cairo_ellipsis (cr,
2744 - box->box.x + box->box.width - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2745 - box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2746 - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2747 - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2748 - 0, G_PI / 2);
2749 - _cairo_ellipsis (cr,
2750 - box->box.x + box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2751 - box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2752 - box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2753 - box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2754 - G_PI / 2, G_PI);
2755 -
2756 - cairo_close_path (cr);
2757 -}
2758 -
2759 -double
2760 -_gtk_rounded_box_guess_length (const GtkRoundedBox *box,
2761 - GtkCssSide side)
2762 -{
2763 - double length;
2764 - GtkCssCorner before, after;
2765 -
2766 - before = side;
2767 - after = (side + 1) % 4;
2768 -
2769 - if (side & 1)
2770 - length = box->box.height
2771 - - box->corner[before].vertical
2772 - - box->corner[after].vertical;
2773 - else
2774 - length = box->box.width
2775 - - box->corner[before].horizontal
2776 - - box->corner[after].horizontal;
2777 -
2778 - length += G_PI * 0.125 * (box->corner[before].horizontal
2779 - + box->corner[before].vertical
2780 - + box->corner[after].horizontal
2781 - + box->corner[after].vertical);
2782 -
2783 - return length;
2784 -}
2785 -
2786 -void
2787 -_gtk_rounded_box_path_side (const GtkRoundedBox *box,
2788 - cairo_t *cr,
2789 - GtkCssSide side)
2790 -{
2791 - switch (side)
2792 - {
2793 - case GTK_CSS_TOP:
2794 - _cairo_ellipsis (cr,
2795 - box->box.x + box->corner[GTK_CSS_TOP_LEFT].horizontal,
2796 - box->box.y + box->corner[GTK_CSS_TOP_LEFT].vertical,
2797 - box->corner[GTK_CSS_TOP_LEFT].horizontal,
2798 - box->corner[GTK_CSS_TOP_LEFT].vertical,
2799 - 5 * G_PI / 4, 3 * G_PI / 2);
2800 - _cairo_ellipsis (cr,
2801 - box->box.x + box->box.width - box->corner[GTK_CSS_TOP_RIGHT].horizontal,
2802 - box->box.y + box->corner[GTK_CSS_TOP_RIGHT].vertical,
2803 - box->corner[GTK_CSS_TOP_RIGHT].horizontal,
2804 - box->corner[GTK_CSS_TOP_RIGHT].vertical,
2805 - - G_PI / 2, -G_PI / 4);
2806 - break;
2807 - case GTK_CSS_RIGHT:
2808 - _cairo_ellipsis (cr,
2809 - box->box.x + box->box.width - box->corner[GTK_CSS_TOP_RIGHT].horizontal,
2810 - box->box.y + box->corner[GTK_CSS_TOP_RIGHT].vertical,
2811 - box->corner[GTK_CSS_TOP_RIGHT].horizontal,
2812 - box->corner[GTK_CSS_TOP_RIGHT].vertical,
2813 - - G_PI / 4, 0);
2814 - _cairo_ellipsis (cr,
2815 - box->box.x + box->box.width - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2816 - box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2817 - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2818 - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2819 - 0, G_PI / 4);
2820 - break;
2821 - case GTK_CSS_BOTTOM:
2822 - _cairo_ellipsis (cr,
2823 - box->box.x + box->box.width - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2824 - box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2825 - box->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2826 - box->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2827 - G_PI / 4, G_PI / 2);
2828 - _cairo_ellipsis (cr,
2829 - box->box.x + box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2830 - box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2831 - box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2832 - box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2833 - G_PI / 2, 3 * G_PI / 4);
2834 - break;
2835 - case GTK_CSS_LEFT:
2836 - _cairo_ellipsis (cr,
2837 - box->box.x + box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2838 - box->box.y + box->box.height - box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2839 - box->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2840 - box->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2841 - 3 * G_PI / 4, G_PI);
2842 - _cairo_ellipsis (cr,
2843 - box->box.x + box->corner[GTK_CSS_TOP_LEFT].horizontal,
2844 - box->box.y + box->corner[GTK_CSS_TOP_LEFT].vertical,
2845 - box->corner[GTK_CSS_TOP_LEFT].horizontal,
2846 - box->corner[GTK_CSS_TOP_LEFT].vertical,
2847 - G_PI, 5 * G_PI / 4);
2848 - break;
2849 - default:
2850 - g_assert_not_reached ();
2851 - break;
2852 - }
2853 -}
2854 -
2855 -void
2856 -_gtk_rounded_box_path_top (const GtkRoundedBox *outer,
2857 - const GtkRoundedBox *inner,
2858 - cairo_t *cr)
2859 -{
2860 - cairo_new_sub_path (cr);
2861 -
2862 - _cairo_ellipsis (cr,
2863 - outer->box.x + outer->corner[GTK_CSS_TOP_LEFT].horizontal,
2864 - outer->box.y + outer->corner[GTK_CSS_TOP_LEFT].vertical,
2865 - outer->corner[GTK_CSS_TOP_LEFT].horizontal,
2866 - outer->corner[GTK_CSS_TOP_LEFT].vertical,
2867 - 5 * G_PI / 4, 3 * G_PI / 2);
2868 - _cairo_ellipsis (cr,
2869 - outer->box.x + outer->box.width - outer->corner[GTK_CSS_TOP_RIGHT].horizontal,
2870 - outer->box.y + outer->corner[GTK_CSS_TOP_RIGHT].vertical,
2871 - outer->corner[GTK_CSS_TOP_RIGHT].horizontal,
2872 - outer->corner[GTK_CSS_TOP_RIGHT].vertical,
2873 - - G_PI / 2, -G_PI / 4);
2874 -
2875 - _cairo_ellipsis_negative (cr,
2876 - inner->box.x + inner->box.width - inner->corner[GTK_CSS_TOP_RIGHT].horizontal,
2877 - inner->box.y + inner->corner[GTK_CSS_TOP_RIGHT].vertical,
2878 - inner->corner[GTK_CSS_TOP_RIGHT].horizontal,
2879 - inner->corner[GTK_CSS_TOP_RIGHT].vertical,
2880 - -G_PI / 4, - G_PI / 2);
2881 - _cairo_ellipsis_negative (cr,
2882 - inner->box.x + inner->corner[GTK_CSS_TOP_LEFT].horizontal,
2883 - inner->box.y + inner->corner[GTK_CSS_TOP_LEFT].vertical,
2884 - inner->corner[GTK_CSS_TOP_LEFT].horizontal,
2885 - inner->corner[GTK_CSS_TOP_LEFT].vertical,
2886 - 3 * G_PI / 2, 5 * G_PI / 4);
2887 -
2888 - cairo_close_path (cr);
2889 -}
2890 -
2891 -void
2892 -_gtk_rounded_box_path_right (const GtkRoundedBox *outer,
2893 - const GtkRoundedBox *inner,
2894 - cairo_t *cr)
2895 -{
2896 - cairo_new_sub_path (cr);
2897 -
2898 - _cairo_ellipsis (cr,
2899 - outer->box.x + outer->box.width - outer->corner[GTK_CSS_TOP_RIGHT].horizontal,
2900 - outer->box.y + outer->corner[GTK_CSS_TOP_RIGHT].vertical,
2901 - outer->corner[GTK_CSS_TOP_RIGHT].horizontal,
2902 - outer->corner[GTK_CSS_TOP_RIGHT].vertical,
2903 - - G_PI / 4, 0);
2904 - _cairo_ellipsis (cr,
2905 - outer->box.x + outer->box.width - outer->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2906 - outer->box.y + outer->box.height - outer->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2907 - outer->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2908 - outer->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2909 - 0, G_PI / 4);
2910 -
2911 - _cairo_ellipsis_negative (cr,
2912 - inner->box.x + inner->box.width - inner->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2913 - inner->box.y + inner->box.height - inner->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2914 - inner->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2915 - inner->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2916 - G_PI / 4, 0);
2917 - _cairo_ellipsis_negative (cr,
2918 - inner->box.x + inner->box.width - inner->corner[GTK_CSS_TOP_RIGHT].horizontal,
2919 - inner->box.y + inner->corner[GTK_CSS_TOP_RIGHT].vertical,
2920 - inner->corner[GTK_CSS_TOP_RIGHT].horizontal,
2921 - inner->corner[GTK_CSS_TOP_RIGHT].vertical,
2922 - 0, - G_PI / 4);
2923 -
2924 - cairo_close_path (cr);
2925 -}
2926 -
2927 -void
2928 -_gtk_rounded_box_path_bottom (const GtkRoundedBox *outer,
2929 - const GtkRoundedBox *inner,
2930 - cairo_t *cr)
2931 -{
2932 - cairo_new_sub_path (cr);
2933 -
2934 - _cairo_ellipsis (cr,
2935 - outer->box.x + outer->box.width - outer->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2936 - outer->box.y + outer->box.height - outer->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2937 - outer->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2938 - outer->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2939 - G_PI / 4, G_PI / 2);
2940 - _cairo_ellipsis (cr,
2941 - outer->box.x + outer->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2942 - outer->box.y + outer->box.height - outer->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2943 - outer->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2944 - outer->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2945 - G_PI / 2, 3 * G_PI / 4);
2946 -
2947 - _cairo_ellipsis_negative (cr,
2948 - inner->box.x + inner->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2949 - inner->box.y + inner->box.height - inner->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2950 - inner->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2951 - inner->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2952 - 3 * G_PI / 4, G_PI / 2);
2953 - _cairo_ellipsis_negative (cr,
2954 - inner->box.x + inner->box.width - inner->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2955 - inner->box.y + inner->box.height - inner->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2956 - inner->corner[GTK_CSS_BOTTOM_RIGHT].horizontal,
2957 - inner->corner[GTK_CSS_BOTTOM_RIGHT].vertical,
2958 - G_PI / 2, G_PI / 4);
2959 -
2960 - cairo_close_path (cr);
2961 -}
2962 -
2963 -void
2964 -_gtk_rounded_box_path_left (const GtkRoundedBox *outer,
2965 - const GtkRoundedBox *inner,
2966 - cairo_t *cr)
2967 -{
2968 - cairo_new_sub_path (cr);
2969 -
2970 - _cairo_ellipsis (cr,
2971 - outer->box.x + outer->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2972 - outer->box.y + outer->box.height - outer->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2973 - outer->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2974 - outer->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2975 - 3 * G_PI / 4, G_PI);
2976 - _cairo_ellipsis (cr,
2977 - outer->box.x + outer->corner[GTK_CSS_TOP_LEFT].horizontal,
2978 - outer->box.y + outer->corner[GTK_CSS_TOP_LEFT].vertical,
2979 - outer->corner[GTK_CSS_TOP_LEFT].horizontal,
2980 - outer->corner[GTK_CSS_TOP_LEFT].vertical,
2981 - G_PI, 5 * G_PI / 4);
2982 -
2983 - _cairo_ellipsis_negative (cr,
2984 - inner->box.x + inner->corner[GTK_CSS_TOP_LEFT].horizontal,
2985 - inner->box.y + inner->corner[GTK_CSS_TOP_LEFT].vertical,
2986 - inner->corner[GTK_CSS_TOP_LEFT].horizontal,
2987 - inner->corner[GTK_CSS_TOP_LEFT].vertical,
2988 - 5 * G_PI / 4, G_PI);
2989 - _cairo_ellipsis_negative (cr,
2990 - inner->box.x + inner->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2991 - inner->box.y + inner->box.height - inner->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2992 - inner->corner[GTK_CSS_BOTTOM_LEFT].horizontal,
2993 - inner->corner[GTK_CSS_BOTTOM_LEFT].vertical,
2994 - G_PI, 3 * G_PI / 4);
2995 -
2996 - cairo_close_path (cr);
2997 -}
2998 -
2999 -void
3000 -_gtk_rounded_box_clip_path (const GtkRoundedBox *box,
3001 - cairo_t *cr)
3002 -{
3003 - cairo_rectangle (cr,
3004 - box->box.x, box->box.y,
3005 - box->box.width, box->box.height);
3006 -}
3008 === removed file 'unico/gtkroundedboxprivate.h'
3009 --- unico/gtkroundedboxprivate.h 2012-02-08 12:54:39 +0000
3010 +++ unico/gtkroundedboxprivate.h 1970-01-01 00:00:00 +0000
3011 @@ -1,97 +0,0 @@
3012 - /* GTK - The GIMP Toolkit
3013 - * Copyright (C) 2011 Benjamin Otte <otte@gnome.org>
3014 - *
3015 - * This library is free software; you can redistribute it and/or
3016 - * modify it under the terms of the GNU Lesser General Public
3017 - * License as published by the Free Software Foundation; either
3018 - * version 2 of the License, or (at your option) any later version.
3019 - *
3020 - * This library is distributed in the hope that it will be useful,
3021 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
3022 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3023 - * Lesser General Public License for more details.
3024 - *
3025 - * You should have received a copy of the GNU Lesser General Public
3026 - * License along with this library; if not, write to the
3027 - * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
3028 - * Boston, MA 02111-1307, USA.
3029 - */
3030 -
3031 -#ifndef __GTK_ROUNDED_BOX_PRIVATE_H__
3032 -#define __GTK_ROUNDED_BOX_PRIVATE_H__
3033 -
3034 -#include <cairo.h>
3035 -#include <gtk/gtk.h>
3036 -
3037 -#include "unico-types.h"
3038 -
3039 -G_BEGIN_DECLS
3040 -
3041 -typedef struct _GtkRoundedBox GtkRoundedBox;
3042 -typedef struct _GtkRoundedBoxCorner GtkRoundedBoxCorner;
3043 -
3044 -struct _GtkRoundedBoxCorner {
3045 - double horizontal;
3046 - double vertical;
3047 -};
3048 -
3049 -struct _GtkRoundedBox {
3050 - cairo_rectangle_t box;
3051 - GtkRoundedBoxCorner corner[4];
3052 -};
3053 -
3054 -double _gtk_css_number_get (const GtkCssNumber *number,
3055 - double one_hundred_percent);
3056 -
3057 -void _gtk_rounded_box_init_rect (GtkRoundedBox *box,
3058 - gdouble x,
3059 - gdouble y,
3060 - gdouble width,
3061 - gdouble height);
3062 -
3063 -void _gtk_rounded_box_apply_border_radius (GtkRoundedBox *box,
3064 - GtkThemingEngine *engine,
3065 - GtkStateFlags state,
3066 - GtkJunctionSides junction);
3067 -
3068 -void _gtk_rounded_box_grow (GtkRoundedBox *box,
3069 - gdouble top,
3070 - gdouble right,
3071 - gdouble bottom,
3072 - gdouble left);
3073 -
3074 -void _gtk_rounded_box_shrink (GtkRoundedBox *box,
3075 - gdouble top,
3076 - gdouble right,
3077 - gdouble bottom,
3078 - gdouble left);
3079 -
3080 -void _gtk_rounded_box_move (GtkRoundedBox *box,
3081 - gdouble dx,
3082 - gdouble dy);
3083 -
3084 -void _gtk_rounded_box_path (const GtkRoundedBox *box,
3085 - cairo_t *cr);
3086 -
3087 -void _gtk_rounded_box_path_top (const GtkRoundedBox *outer,
3088 - const GtkRoundedBox *inner,
3089 - cairo_t *cr);
3090 -
3091 -void _gtk_rounded_box_path_right (const GtkRoundedBox *outer,
3092 - const GtkRoundedBox *inner,
3093 - cairo_t *cr);
3094 -
3095 -void _gtk_rounded_box_path_bottom (const GtkRoundedBox *outer,
3096 - const GtkRoundedBox *inner,
3097 - cairo_t *cr);
3098 -
3099 -void _gtk_rounded_box_path_left (const GtkRoundedBox *outer,
3100 - const GtkRoundedBox *inner,
3101 - cairo_t *cr);
3102 -
3103 -void _gtk_rounded_box_clip_path (const GtkRoundedBox *box,
3104 - cairo_t *cr);
3105 -
3106 -G_END_DECLS
3107 -
3108 -#endif /* __GTK_ROUNDED_BOX_PRIVATE_H__ */
3110 === removed file 'unico/raico-blur.c'
3111 --- unico/raico-blur.c 2011-08-09 22:26:09 +0000
3112 +++ unico/raico-blur.c 1970-01-01 00:00:00 +0000
3113 @@ -1,173 +0,0 @@
3114 -/* The Unico Theming Engine for Gtk+.
3115 - * Copyright (C) 2009 Canonical Ltd
3116 - *
3117 - * This library is free software; you can redistribute it and/or
3118 - * modify it under the terms of the GNU Lesser General Public
3119 - * License as published by the Free Software Foundation; either
3120 - * version 2 of the License, or (at your option) any later version.
3121 - *
3122 - * This library is distributed in the hope that it will be useful,
3123 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
3124 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3125 - * Lesser General Public License for more details.
3126 - *
3127 - * You should have received a copy of the GNU Lesser General Public
3128 - * License along with this library; if not, write to the Free
3129 - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
3130 - * MA 02110-1301, USA.
3131 - *
3132 - * Authored by Mirco "MacSlow" Mueller <mirco.mueller@canonical.com>
3133 - *
3134 - */
3135 -
3136 -#include "exponential-blur.h"
3137 -#include "raico-blur.h"
3138 -
3139 -struct _raico_blur_private_t
3140 -{
3141 - raico_blur_quality_t quality; /* low, medium, high */
3142 - guint radius; /* blur-radius */
3143 -};
3144 -
3145 -raico_blur_t*
3146 -raico_blur_create (void)
3147 -{
3148 - raico_blur_t* blur = NULL;
3149 - raico_blur_private_t* priv = NULL;
3150 -
3151 - blur = g_new0 (raico_blur_t, 1);
3152 - if (!blur)
3153 - {
3154 - g_debug ("raico_blur_create(): could not allocate blur struct");
3155 - return NULL;
3156 - }
3157 -
3158 - priv = g_new0 (raico_blur_private_t, 1);
3159 - if (!priv)
3160 - {
3161 - g_debug ("raico_blur_create(): could not allocate priv struct");
3162 - g_free ((gpointer) blur);
3163 - return NULL;
3164 - }
3165 -
3166 - priv->quality = RAICO_BLUR_QUALITY_LOW;
3167 -
3168 - priv->radius = 0;
3169 -
3170 - blur->priv = priv;
3171 -
3172 - return blur;
3173 -}
3174 -
3175 -raico_blur_quality_t
3176 -raico_blur_get_quality (raico_blur_t* blur)
3177 -{
3178 - g_assert (blur != NULL);
3179 -
3180 - return blur->priv->quality;
3181 -}
3182 -
3183 -void
3184 -raico_blur_set_quality (raico_blur_t* blur,
3185 - raico_blur_quality_t quality)
3186 -{
3187 - if (!blur)
3188 - {
3189 - g_debug ("raico_blur_set_quality(): NULL blur-pointer passed");
3190 - return;
3191 - }
3192 -
3193 - blur->priv->quality = quality;
3194 -}
3195 -
3196 -guint
3197 -raico_blur_get_radius (raico_blur_t* blur)
3198 -{
3199 - g_assert (blur != NULL);
3200 -
3201 - return blur->priv->radius;
3202 -}
3203 -
3204 -void
3205 -raico_blur_set_radius (raico_blur_t* blur,
3206 - guint radius)
3207 -{
3208 - if (!blur)
3209 - {
3210 - g_debug ("raico_blur_set_radius(): NULL blur-pointer passed");
3211 - return;
3212 - }
3213 -
3214 - blur->priv->radius = radius;
3215 -}
3216 -
3217 -void
3218 -raico_blur_apply (raico_blur_t* blur,
3219 - cairo_surface_t* surface)
3220 -{
3221 - cairo_format_t format;
3222 -
3223 - /* sanity checks */
3224 - if (!blur)
3225 - {
3226 - g_debug ("raico_blur_apply(): NULL blur-pointer passed");
3227 - return;
3228 - }
3229 -
3230 - if (!surface)
3231 - {
3232 - g_debug ("raico_blur_apply(): NULL surface-pointer passed");
3233 - return;
3234 - }
3235 -
3236 - if (cairo_surface_status (surface) != CAIRO_STATUS_SUCCESS)
3237 - {
3238 - g_debug ("raico_blur_apply(): invalid surface status");
3239 - return;
3240 - }
3241 -
3242 - if (cairo_surface_get_type (surface) != CAIRO_SURFACE_TYPE_IMAGE)
3243 - {
3244 - g_debug ("raico_blur_apply(): non-image surface passed");
3245 - return;
3246 - }
3247 -
3248 - format = cairo_image_surface_get_format (surface);
3249 - if (format != CAIRO_FORMAT_A8 &&
3250 - format != CAIRO_FORMAT_RGB24 &&
3251 - format != CAIRO_FORMAT_ARGB32)
3252 - {
3253 - g_debug ("raico_blur_apply(): unsupported image-format");
3254 - return;
3255 - }
3256 -
3257 - /* stupid, but you never know */
3258 - if (blur->priv->radius == 0)
3259 - return;
3260 -
3261 - /* now do the real work */
3262 - switch (blur->priv->quality)
3263 - {
3264 - default:
3265 - case RAICO_BLUR_QUALITY_HIGH:
3266 - case RAICO_BLUR_QUALITY_MEDIUM:
3267 - /* Not implemented yet */
3268 - //surface_gaussian_blur (surface, blur->priv->radius);
3269 - case RAICO_BLUR_QUALITY_LOW:
3270 - surface_exponential_blur (surface, blur->priv->radius);
3271 - break;
3272 - }
3273 -}
3274 -
3275 -void
3276 -raico_blur_destroy (raico_blur_t* blur)
3277 -{
3278 - if (!blur)
3279 - {
3280 - g_debug ("raico_blur_destroy(): invalid blur-pointer passed");
3281 - return;
3282 - }
3283 -
3284 - g_free ((gpointer) blur->priv);
3285 - g_free ((gpointer) blur);
3286 -}
3288 === removed file 'unico/raico-blur.h'
3289 --- unico/raico-blur.h 2011-08-09 22:26:09 +0000
3290 +++ unico/raico-blur.h 1970-01-01 00:00:00 +0000
3291 @@ -1,67 +0,0 @@
3292 -/* The Unico Theming Engine for Gtk+.
3293 - * Copyright (C) 2009 Canonical Ltd
3294 - *
3295 - * This library is free software; you can redistribute it and/or
3296 - * modify it under the terms of the GNU Lesser General Public
3297 - * License as published by the Free Software Foundation; either
3298 - * version 2 of the License, or (at your option) any later version.
3299 - *
3300 - * This library is distributed in the hope that it will be useful,
3301 - * but WITHOUT ANY WARRANTY; without even the implied warranty of
3302 - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
3303 - * Lesser General Public License for more details.
3304 - *
3305 - * You should have received a copy of the GNU Lesser General Public
3306 - * License along with this library; if not, write to the Free
3307 - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
3308 - * MA 02110-1301, USA.
3309 - *
3310 - * Authored by Mirco "MacSlow" Mueller <mirco.mueller@canonical.com>
3311 - *
3312 - */
3313 -
3314 -#ifndef _RAICO_BLUR_H
3315 -#define _RAICO_BLUR_H
3316 -
3317 -#include <cairo.h>
3318 -#include <glib.h>
3319 -
3320 -typedef enum _raico_blur_quality_t
3321 -{
3322 - RAICO_BLUR_QUALITY_LOW = 0, /* low quality, but fast, maybe interactive */
3323 - RAICO_BLUR_QUALITY_MEDIUM, /* compromise between speed and quality */
3324 - RAICO_BLUR_QUALITY_HIGH /* quality before speed */
3325 -} raico_blur_quality_t;
3326 -
3327 -typedef struct _raico_blur_private_t raico_blur_private_t;
3328 -
3329 -typedef struct _raico_blur_t
3330 -{
3331 - raico_blur_private_t* priv;
3332 -} raico_blur_t;
3333 -
3334 -raico_blur_t*
3335 -raico_blur_create (void);
3336 -
3337 -raico_blur_quality_t
3338 -raico_blur_get_quality (raico_blur_t* blur);
3339 -
3340 -void
3341 -raico_blur_set_quality (raico_blur_t* blur,
3342 - raico_blur_quality_t quality);
3343 -
3344 -guint
3345 -raico_blur_get_radius (raico_blur_t* blur);
3346 -
3347 -void
3348 -raico_blur_set_radius (raico_blur_t* blur,
3349 - guint radius);
3350 -
3351 -void
3352 -raico_blur_apply (raico_blur_t* blur,
3353 - cairo_surface_t* surface);
3354 -
3355 -void
3356 -raico_blur_destroy (raico_blur_t* blur);
3357 -
3358 -#endif /* _RAICO_BLUR_H */
3360 === modified file 'unico/unico-cairo-support.c'
3361 --- unico/unico-cairo-support.c 2012-03-26 15:10:02 +0000
3362 +++ unico/unico-cairo-support.c 2016-01-19 12:14:18 +0000
3363 @@ -1,10 +1,9 @@
3364 /* The Unico Theming Engine for Gtk+.
3365 * Copyright (C) 2011 Canonical Ltd
3366 *
3367 - * This library is free software; you can redistribute it and/or
3368 - * modify it under the terms of the GNU Lesser General Public
3369 - * License as published by the Free Software Foundation; either
3370 - * version 2 of the License, or (at your option) any later version.
3371 + * This library is free software; you can redistribute it and/or modify
3372 + * it under the terms of the GNU Lesser General Public License
3373 + * version 2.1 as published by the Free Software Foundation.
3374 *
3375 * This library is distributed in the hope that it will be useful,
3376 * but WITHOUT ANY WARRANTY; without even the implied warranty of
3377 @@ -23,1220 +22,10 @@
3378 #include <cairo.h>
3379 #include <gtk/gtk.h>
3381 -#include "gtkroundedboxprivate.h"
3382 -#include "raico-blur.h"
3383 #include "unico-cairo-support.h"
3384 #include "unico-support.h"
3385 #include "unico-types.h"
3387 -/* apply default color */
3388 -static void
3389 -apply_default_color (GdkRGBA *colors[4],
3390 - GdkRGBA *default_color)
3391 -{
3392 - gint i;
3393 -
3394 - for (i = 0; i < 4; i++)
3395 - if (unico_gdk_rgba_is_default (colors[i]))
3396 - *colors[i] = *default_color;
3397 -}
3398 -
3399 -/* set the border sides to 0 using hidden_side */
3400 -static void
3401 -hide_border_sides (GtkBorder *border,
3402 - guint hidden_side)
3403 -{
3404 - if (hidden_side & SIDE_TOP)
3405 - border->top = 0;
3406 - if (hidden_side & SIDE_RIGHT)
3407 - border->right = 0;
3408 - if (hidden_side & SIDE_BOTTOM)
3409 - border->bottom = 0;
3410 - if (hidden_side & SIDE_LEFT)
3411 - border->left = 0;
3412 -}
3413 -
3414 -/* shrink coordinate using GtkBorder */
3415 -static void
3416 -shrink_with_border (GtkBorder *border,
3417 - gdouble *x,
3418 - gdouble *y,
3419 - gdouble *width,
3420 - gdouble *height)
3421 -{
3422 - *x += border->left;
3423 - *y += border->top;
3424 - *width -= border->left + border->right;
3425 - *height -= border->top + border->bottom;
3426 -}
3427 -
3428 -/* draw the background */
3429 -static void
3430 -draw_background (GtkThemingEngine *engine,
3431 - cairo_t *cr,
3432 - gdouble x,
3433 - gdouble y,
3434 - gdouble width,
3435 - gdouble height,
3436 - guint hidden_side,
3437 - GtkJunctionSides junction)
3438 -{
3439 - GdkRGBA bg_color;
3440 - GtkBorder border;
3441 - GtkRoundedBox border_box;
3442 - GtkStateFlags state;
3443 - cairo_pattern_t *bg_pat;
3444 - gdouble progress;
3445 - gboolean running;
3446 -
3447 - state = gtk_theming_engine_get_state (engine);
3448 -
3449 - gtk_theming_engine_get (engine, state,
3450 - "background-image", &bg_pat,
3451 - NULL);
3452 - gtk_theming_engine_get_background_color (engine, state, &bg_color);
3453 - gtk_theming_engine_get_border (engine, state, &border);
3454 -
3455 - hide_border_sides (&border, hidden_side);
3456 -
3457 - running = gtk_theming_engine_state_is_running (engine, GTK_STATE_PRELIGHT, &progress);
3458 -
3459 - cairo_save (cr);
3460 -
3461 - cairo_translate (cr, x, y);
3462 -
3463 - /* clear cr if we can draw directly on the background */
3464 - if (gtk_theming_engine_has_class (engine, "background"))
3465 - {
3466 - cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.0); /* transparent */
3467 - cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
3468 - cairo_paint (cr);
3469 - }
3470 -
3471 - if (running)
3472 - {
3473 - GdkRGBA other_bg;
3474 - GtkStateFlags other_state;
3475 - cairo_pattern_t *new_pat = NULL;
3476 - cairo_pattern_t *other_pat;
3477 -
3478 - if (state & GTK_STATE_FLAG_PRELIGHT)
3479 - {
3480 - other_state = state & ~(GTK_STATE_FLAG_PRELIGHT);
3481 -
3482 - /* useful math function to use for a pulse loop animation could be
3483 - * progress = 1 - MAX (1 - fabs ((progress - 0.5)*2), 0);
3484 - * but we need to handle the not-running case (once animation finished),
3485 - * otherwise the last frame will be the PRELIGHT at full opacity. */
3486 - progress = 1 - progress;
3487 - }
3488 - else
3489 - other_state = state | GTK_STATE_FLAG_PRELIGHT;
3490 -
3491 - gtk_theming_engine_get (engine, other_state,
3492 - "background-image", &other_pat,
3493 - NULL);
3494 - gtk_theming_engine_get_background_color (engine, other_state, &other_bg);
3495 -
3496 - if (bg_pat && other_pat)
3497 - {
3498 - /* two patterns */
3499 - cairo_pattern_type_t type, other_type;
3500 - gint n0, n1;
3501 -
3502 - cairo_pattern_get_color_stop_count (bg_pat, &n0);
3503 - cairo_pattern_get_color_stop_count (other_pat, &n1);
3504 - type = cairo_pattern_get_type (bg_pat);
3505 - other_type = cairo_pattern_get_type (other_pat);
3506 -
3507 - if (type == other_type && n0 == n1)
3508 - {
3509 - /* two similar patterns, blend them point by point */
3510 - gdouble offset0, red0, green0, blue0, alpha0;
3511 - gdouble offset1, red1, green1, blue1, alpha1;
3512 - gdouble x00, x01, y00, y01, x10, x11, y10, y11;
3513 - gdouble r00, r01, r10, r11;
3514 - gint i;
3515 -
3516 - if (type == CAIRO_PATTERN_TYPE_LINEAR)
3517 - {
3518 - cairo_pattern_get_linear_points (bg_pat, &x00, &y00, &x01, &y01);
3519 - cairo_pattern_get_linear_points (other_pat, &x10, &y10, &x11, &y11);
3520 -
3521 - new_pat = cairo_pattern_create_linear (x00 + (x10 - x00) * progress,
3522 - y00 + (y10 - y00) * progress,
3523 - x01 + (x11 - x01) * progress,
3524 - y01 + (y11 - y01) * progress);
3525 - }
3526 - else
3527 - {
3528 - cairo_pattern_get_radial_circles (bg_pat, &x00, &y00, &r00, &x01, &y01, &r01);
3529 - cairo_pattern_get_radial_circles (other_pat, &x10, &y10, &r10, &x11, &y11, &r11);
3530 -
3531 - new_pat = cairo_pattern_create_radial (x00 + (x10 - x00) * progress,
3532 - y00 + (y10 - y00) * progress,
3533 - r00 + (r10 - r00) * progress,
3534 - x01 + (x11 - x01) * progress,
3535 - y01 + (y11 - y01) * progress,
3536 - r01 + (r11 - r01) * progress);
3537 - }
3538 -
3539 - cairo_pattern_set_filter (new_pat, CAIRO_FILTER_FAST);
3540 - i = 0;
3541 -
3542 - while (i < n0 && i < n1)
3543 - {
3544 - cairo_pattern_get_color_stop_rgba (bg_pat, i,
3545 - &offset0,
3546 - &red0, &green0, &blue0,
3547 - &alpha0);
3548 - cairo_pattern_get_color_stop_rgba (other_pat, i,
3549 - &offset1,
3550 - &red1, &green1, &blue1,
3551 - &alpha1);
3552 - cairo_pattern_add_color_stop_rgba (new_pat,
3553 - offset0 + ((offset1 - offset0) * progress),
3554 - red0 + ((red1 - red0) * progress),
3555 - green0 + ((green1 - green0) * progress),
3556 - blue0 + ((blue1 - blue0) * progress),
3557 - alpha0 + ((alpha1 - alpha0) * progress));
3558 - i++;
3559 - }
3560 - }
3561 - else
3562 - {
3563 - /* two different patterns, paint them with alpha */
3564 - cairo_save (cr);
3565 -
3566 - cairo_reset_clip (cr);
3567 - cairo_rectangle (cr, 0, 0, width, height);
3568 - cairo_clip (cr);
3569 -
3570 - cairo_push_group (cr);
3571 -
3572 - cairo_scale (cr, width, height);
3573 -
3574 - cairo_set_source (cr, other_pat);
3575 - cairo_paint_with_alpha (cr, progress);
3576 -
3577 - cairo_set_source (cr, bg_pat);
3578 - cairo_paint_with_alpha (cr, 1.0 - progress);
3579 -
3580 - new_pat = cairo_pop_group (cr);
3581 -
3582 - cairo_restore (cr);
3583 - }
3584 - }
3585 - else if (bg_pat || other_pat)
3586 - {
3587 - /* only one pattern, blend it with a color */
3588 - const GdkRGBA *c;
3589 - cairo_pattern_t *p;
3590 - gdouble x0, y0, x1, y1, r0, r1;
3591 - gint n, i;
3592 -
3593 - if (bg_pat)
3594 - {
3595 - p = bg_pat;
3596 - c = &other_bg;
3597 - progress = 1 - progress;
3598 - }
3599 - else
3600 - {
3601 - p = other_pat;
3602 - c = &bg_color;
3603 - }
3604 -
3605 - if (cairo_pattern_get_type (p) == CAIRO_PATTERN_TYPE_LINEAR)
3606 - {
3607 - cairo_pattern_get_linear_points (p, &x0, &y0, &x1, &y1);
3608 - new_pat = cairo_pattern_create_linear (x0, y0, x1, y1);
3609 - }
3610 - else
3611 - {
3612 - cairo_pattern_get_radial_circles (p, &x0, &y0, &r0, &x1, &y1, &r1);
3613 - new_pat = cairo_pattern_create_radial (x0, y0, r0, x1, y1, r1);
3614 - }
3615 -
3616 - cairo_pattern_get_color_stop_count (p, &n);
3617 -
3618 - for (i = 0; i < n; i++)
3619 - {
3620 - gdouble red1, green1, blue1, alpha1;
3621 - gdouble offset;
3622 -
3623 - cairo_pattern_get_color_stop_rgba (p, i,
3624 - &offset,
3625 - &red1, &green1, &blue1,
3626 - &alpha1);
3627 - cairo_pattern_add_color_stop_rgba (new_pat, offset,
3628 - c->red + ((red1 - c->red) * progress),
3629 - c->green + ((green1 - c->green) * progress),
3630 - c->blue + ((blue1 - c->blue) * progress),
3631 - c->alpha + ((alpha1 - c->alpha) * progress));
3632 - }
3633 - }
3634 - else
3635 - {
3636 - /* just colors, create a new pattern blending them */
3637 - new_pat = cairo_pattern_create_rgba (CLAMP (bg_color.red + ((other_bg.red - bg_color.red) * progress), 0, 1),
3638 - CLAMP (bg_color.green + ((other_bg.green - bg_color.green) * progress), 0, 1),
3639 - CLAMP (bg_color.blue + ((other_bg.blue - bg_color.blue) * progress), 0, 1),
3640 - CLAMP (bg_color.alpha + ((other_bg.alpha - bg_color.alpha) * progress), 0, 1));
3641 - }
3642 -
3643 - if (new_pat)
3644 - {
3645 - /* replace pattern to use */
3646 - cairo_pattern_destroy (bg_pat);
3647 - bg_pat = new_pat;
3648 - }
3649 -
3650 - if (other_pat)
3651 - cairo_pattern_destroy (other_pat);
3652 - }
3653 -
3654 - /* create the path to fill */
3655 - _gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
3656 - _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
3657 - _gtk_rounded_box_shrink (&border_box, border.top, border.right, border.bottom, border.left);
3658 - _gtk_rounded_box_path (&border_box, cr);
3659 -
3660 - if (bg_pat)
3661 - {
3662 - /* pattern */
3663 - cairo_scale (cr, width, height);
3664 - cairo_set_source (cr, bg_pat);
3665 - cairo_scale (cr, 1.0 / width, 1.0 / height);
3666 - }
3667 - else
3668 - /* one color */
3669 - gdk_cairo_set_source_rgba (cr, &bg_color);
3670 -
3671 - cairo_fill (cr);
3672 -
3673 - if (bg_pat)
3674 - cairo_pattern_destroy (bg_pat);
3675 -
3676 - cairo_restore (cr);
3677 -}
3678 -
3679 -/* draw the inner glow */
3680 -static void
3681 -draw_glow (GtkThemingEngine *engine,
3682 - cairo_t *cr,
3683 - gdouble x,
3684 - gdouble y,
3685 - gdouble width,
3686 - gdouble height,
3687 - guint hidden_side,
3688 - GtkJunctionSides junction)
3689 -{
3690 - GdkRGBA *glow_color;
3691 - GtkBorder border;
3692 - GtkRoundedBox border_box, padding_box;
3693 - GtkStateFlags state;
3694 - cairo_t *cr_surface;
3695 - cairo_surface_t *surface;
3696 - gint bradius = 0;
3697 - raico_blur_t* blur = NULL;
3698 -
3699 - state = gtk_theming_engine_get_state (engine);
3700 -
3701 - gtk_theming_engine_get (engine, state,
3702 - "-unico-glow-radius", &bradius,
3703 - "-unico-glow-color", &glow_color,
3704 - NULL);
3705 -
3706 - if (bradius <= 0)
3707 - goto end_draw_glow;
3708 -
3709 - gtk_theming_engine_get_border (engine, state, &border);
3710 -
3711 - hide_border_sides (&border, hidden_side);
3712 -
3713 - cairo_save (cr);
3714 -
3715 - cairo_translate (cr, x, y);
3716 -
3717 - /* create the path to clip */
3718 - _gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
3719 - _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
3720 - _gtk_rounded_box_shrink (&border_box, border.top, border.right, border.bottom, border.left);
3721 - _gtk_rounded_box_path (&border_box, cr);
3722 -
3723 - cairo_clip (cr);
3724 -
3725 - /* create the surface to blur */
3726 - surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
3727 - width + bradius * 2,
3728 - height + bradius * 2);
3729 - cr_surface = cairo_create (surface);
3730 -
3731 - /* create the path on the surface to blur */
3732 - _gtk_rounded_box_move (&border_box, bradius, bradius);
3733 - padding_box = border_box;
3734 - _gtk_rounded_box_shrink (&padding_box, border.top * 2, border.right * 2, border.bottom * 2, border.left * 2);
3735 -
3736 - cairo_set_fill_rule (cr_surface, CAIRO_FILL_RULE_EVEN_ODD);
3737 -
3738 - gdk_cairo_set_source_rgba (cr_surface, glow_color);
3739 -
3740 - _gtk_rounded_box_path (&border_box, cr_surface);
3741 - _gtk_rounded_box_path (&padding_box, cr_surface);
3742 - cairo_fill (cr_surface);
3743 -
3744 - /* create and apply raico blur */
3745 - blur = raico_blur_create ();
3746 - raico_blur_set_radius (blur, bradius);
3747 - raico_blur_apply (blur, surface);
3748 -
3749 - /* paint the blurred surface to cr */
3750 - cairo_set_source_surface (cr, surface, - bradius, - bradius);
3751 - cairo_paint (cr);
3752 -
3753 - cairo_restore (cr);
3754 -
3755 - raico_blur_destroy(blur);
3756 -
3757 - cairo_surface_destroy (surface);
3758 - cairo_destroy (cr_surface);
3759 -
3760 -end_draw_glow:
3761 - gdk_rgba_free (glow_color);
3762 -}
3763 -
3764 -/* draw a repeated texture */
3765 -static void
3766 -draw_texture (GtkThemingEngine *engine,
3767 - cairo_t *cr,
3768 - gdouble x,
3769 - gdouble y,
3770 - gdouble width,
3771 - gdouble height,
3772 - guint hidden_side,
3773 - GtkJunctionSides junction)
3774 -{
3775 - GtkStateFlags state;
3776 - GValue value = { 0, };
3777 - cairo_pattern_t *texture = NULL;
3778 - cairo_surface_t *surface = NULL;
3779 -
3780 - state = gtk_theming_engine_get_state (engine);
3781 -
3782 - gtk_theming_engine_get_property (engine, "-unico-background-texture", state, &value);
3783 -
3784 - if (!G_VALUE_HOLDS_BOXED (&value))
3785 - return;
3786 -
3787 - texture = g_value_dup_boxed (&value);
3788 - g_value_unset (&value);
3789 -
3790 - if (texture != NULL)
3791 - cairo_pattern_get_surface (texture, &surface);
3792 -
3793 - if (surface != NULL)
3794 - {
3795 - GtkBorder border;
3796 - GtkRoundedBox border_box;
3797 - cairo_pattern_t *pat;
3798 -
3799 - gtk_theming_engine_get_border (engine, state, &border);
3800 -
3801 - hide_border_sides (&border, hidden_side);
3802 -
3803 - cairo_save (cr);
3804 -
3805 - cairo_translate (cr, x, y);
3806 -
3807 - /* create the path to fill */
3808 - _gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
3809 - _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
3810 - _gtk_rounded_box_shrink (&border_box, border.top, border.right, border.bottom, border.left);
3811 - _gtk_rounded_box_path (&border_box, cr);
3812 -
3813 - pat = cairo_pattern_create_for_surface (surface);
3814 - cairo_pattern_set_extend (pat, CAIRO_EXTEND_REPEAT);
3815 - cairo_set_source (cr, pat);
3816 -
3817 - cairo_fill (cr);
3818 -
3819 - cairo_restore (cr);
3820 -
3821 - cairo_pattern_destroy (pat);
3822 - }
3823 -
3824 - if (texture != NULL)
3825 - cairo_pattern_destroy (texture);
3826 -}
3827 -
3828 -void
3829 -unico_cairo_draw_background (GtkThemingEngine *engine,
3830 - cairo_t *cr,
3831 - gdouble x,
3832 - gdouble y,
3833 - gdouble width,
3834 - gdouble height,
3835 - guint hidden_side,
3836 - GtkJunctionSides junction)
3837 -{
3838 - GtkBorder *outer_border;
3839 - GtkStateFlags state;
3840 -
3841 - state = gtk_theming_engine_get_state (engine);
3842 -
3843 - gtk_theming_engine_get (engine, state,
3844 - "-unico-outer-stroke-width", &outer_border,
3845 - NULL);
3846 -
3847 - hide_border_sides (outer_border, hidden_side);
3848 -
3849 - shrink_with_border (outer_border, &x, &y, &width, &height);
3850 -
3851 - /* first layer, background */
3852 - draw_background (engine, cr,
3853 - x, y,
3854 - width, height,
3855 - hidden_side, junction);
3856 -
3857 - /* second layer, glow */
3858 - draw_glow (engine, cr,
3859 - x, y,
3860 - width, height,
3861 - hidden_side, junction);
3862 -
3863 - /* third layer, texture */
3864 - draw_texture (engine, cr,
3865 - x, y,
3866 - width, height,
3867 - hidden_side, junction);
3868 -
3869 - gtk_border_free (outer_border);
3870 -}
3871 -
3872 -/* shade a color */
3873 -static void
3874 -color_shade (const GdkRGBA *color,
3875 - gdouble factor,
3876 - GdkRGBA *color_return)
3877 -{
3878 - GtkSymbolicColor *literal, *shade;
3879 -
3880 - literal = gtk_symbolic_color_new_literal (color);
3881 - shade = gtk_symbolic_color_new_shade (literal, factor);
3882 - gtk_symbolic_color_unref (literal);
3883 -
3884 - gtk_symbolic_color_resolve (shade, NULL, color_return);
3885 - gtk_symbolic_color_unref (shade);
3886 -}
3887 -
3888 -/* draw the border */
3889 -static void
3890 -draw_border (GtkThemingEngine *engine,
3891 - cairo_t *cr,
3892 - gdouble x,
3893 - gdouble y,
3894 - gdouble width,
3895 - gdouble height,
3896 - guint hidden_side,
3897 - GtkJunctionSides junction)
3898 -{
3899 - GdkRGBA *colors[4];
3900 - GtkBorder border;
3901 - GtkBorderStyle border_style;
3902 - GtkRoundedBox border_box, padding_box;
3903 - GtkStateFlags state;
3904 - cairo_pattern_t *border_pat;
3905 - gboolean running;
3906 - gdouble progress;
3907 - static const guint current_side[4] = { SIDE_TOP, SIDE_RIGHT, SIDE_BOTTOM, SIDE_LEFT };
3908 - guint i, j;
3909 -
3910 - state = gtk_theming_engine_get_state (engine);
3911 -
3912 - gtk_theming_engine_get (engine, state,
3913 - "border-style", &border_style,
3914 - "border-top-color", &colors[0],
3915 - "border-right-color", &colors[1],
3916 - "border-bottom-color", &colors[2],
3917 - "border-left-color", &colors[3],
3918 - "-unico-border-gradient", &border_pat,
3919 - NULL);
3920 - gtk_theming_engine_get_border (engine, state, &border);
3921 -
3922 - hide_border_sides (&border, hidden_side);
3923 -
3924 - running = gtk_theming_engine_state_is_running (engine, GTK_STATE_PRELIGHT, &progress);
3925 -
3926 - cairo_save (cr);
3927 -
3928 - cairo_translate (cr, x, y);
3929 -
3930 - if (running)
3931 - {
3932 - GtkStateFlags other_state;
3933 - cairo_pattern_t *new_pat = NULL;
3934 - cairo_pattern_t *other_pat;
3935 -
3936 - if (state & GTK_STATE_FLAG_PRELIGHT)
3937 - {
3938 - other_state = state & ~(GTK_STATE_FLAG_PRELIGHT);
3939 - progress = 1 - progress;
3940 - }
3941 - else
3942 - other_state = state | GTK_STATE_FLAG_PRELIGHT;
3943 -
3944 - gtk_theming_engine_get (engine, other_state,
3945 - "-unico-border-gradient", &other_pat,
3946 - NULL);
3947 -
3948 - if (border_pat && other_pat)
3949 - {
3950 - /* two patterns */
3951 - cairo_pattern_type_t type, other_type;
3952 - gint n0, n1;
3953 -
3954 - cairo_pattern_get_color_stop_count (border_pat, &n0);
3955 - cairo_pattern_get_color_stop_count (other_pat, &n1);
3956 - type = cairo_pattern_get_type (border_pat);
3957 - other_type = cairo_pattern_get_type (other_pat);
3958 -
3959 - if (type == other_type && n0 == n1)
3960 - {
3961 - /* two similar patterns, blend them point by point */
3962 - gdouble offset0, red0, green0, blue0, alpha0;
3963 - gdouble offset1, red1, green1, blue1, alpha1;
3964 - gdouble x00, x01, y00, y01, x10, x11, y10, y11;
3965 - gdouble r00, r01, r10, r11;
3966 - gint i;
3967 -
3968 - if (type == CAIRO_PATTERN_TYPE_LINEAR)
3969 - {
3970 - cairo_pattern_get_linear_points (border_pat, &x00, &y00, &x01, &y01);
3971 - cairo_pattern_get_linear_points (other_pat, &x10, &y10, &x11, &y11);
3972 -
3973 - new_pat = cairo_pattern_create_linear (x00 + (x10 - x00) * progress,
3974 - y00 + (y10 - y00) * progress,
3975 - x01 + (x11 - x01) * progress,
3976 - y01 + (y11 - y01) * progress);
3977 - }
3978 - else
3979 - {
3980 - cairo_pattern_get_radial_circles (border_pat, &x00, &y00, &r00, &x01, &y01, &r01);
3981 - cairo_pattern_get_radial_circles (other_pat, &x10, &y10, &r10, &x11, &y11, &r11);
3982 -
3983 - new_pat = cairo_pattern_create_radial (x00 + (x10 - x00) * progress,
3984 - y00 + (y10 - y00) * progress,
3985 - r00 + (r10 - r00) * progress,
3986 - x01 + (x11 - x01) * progress,
3987 - y01 + (y11 - y01) * progress,
3988 - r01 + (r11 - r01) * progress);
3989 - }
3990 -
3991 - cairo_pattern_set_filter (new_pat, CAIRO_FILTER_FAST);
3992 - i = 0;
3993 -
3994 - while (i < n0 && i < n1)
3995 - {
3996 - cairo_pattern_get_color_stop_rgba (border_pat, i,
3997 - &offset0,
3998 - &red0, &green0, &blue0,
3999 - &alpha0);
4000 - cairo_pattern_get_color_stop_rgba (other_pat, i,
4001 - &offset1,
4002 - &red1, &green1, &blue1,
4003 - &alpha1);
4004 - cairo_pattern_add_color_stop_rgba (new_pat,
4005 - offset0 + ((offset1 - offset0) * progress),
4006 - red0 + ((red1 - red0) * progress),
4007 - green0 + ((green1 - green0) * progress),
4008 - blue0 + ((blue1 - blue0) * progress),
4009 - alpha0 + ((alpha1 - alpha0) * progress));
4010 - i++;
4011 - }
4012 - }
4013 - else
4014 - {
4015 - /* two different patterns, paint them with alpha */
4016 - cairo_save (cr);
4017 -
4018 - cairo_reset_clip (cr);
4019 - cairo_rectangle (cr, 0, 0, width, height);
4020 - cairo_clip (cr);
4021 -
4022 - cairo_push_group (cr);
4023 -
4024 - cairo_scale (cr, width, height);
4025 -
4026 - cairo_set_source (cr, other_pat);
4027 - cairo_paint_with_alpha (cr, progress);
4028 -
4029 - cairo_set_source (cr, border_pat);
4030 - cairo_paint_with_alpha (cr, 1.0 - progress);
4031 -
4032 - new_pat = cairo_pop_group (cr);
4033 -
4034 - cairo_restore (cr);
4035 - }
4036 - }
4037 - else if (border_pat || other_pat)
4038 - {
4039 - /* one pattern, blend it with a color */
4040 - const GdkRGBA *c;
4041 - cairo_pattern_t *p;
4042 - gdouble x0, y0, x1, y1, r0, r1;
4043 - gint n, i;
4044 -
4045 - if (border_pat)
4046 - {
4047 - GdkRGBA other_color;
4048 -
4049 - gtk_theming_engine_get_border_color (engine, other_state, &other_color);
4050 -
4051 - p = border_pat;
4052 - c = &other_color;
4053 - progress = 1 - progress;
4054 - }
4055 - else
4056 - {
4057 - GdkRGBA border_color;
4058 -
4059 - gtk_theming_engine_get_border_color (engine, state, &border_color);
4060 -
4061 - p = other_pat;
4062 - c = &border_color;
4063 - }
4064 -
4065 - if (cairo_pattern_get_type (p) == CAIRO_PATTERN_TYPE_LINEAR)
4066 - {
4067 - cairo_pattern_get_linear_points (p, &x0, &y0, &x1, &y1);
4068 - new_pat = cairo_pattern_create_linear (x0, y0, x1, y1);
4069 - }
4070 - else
4071 - {
4072 - cairo_pattern_get_radial_circles (p, &x0, &y0, &r0, &x1, &y1, &r1);
4073 - new_pat = cairo_pattern_create_radial (x0, y0, r0, x1, y1, r1);
4074 - }
4075 -
4076 - cairo_pattern_get_color_stop_count (p, &n);
4077 -
4078 - for (i = 0; i < n; i++)
4079 - {
4080 - gdouble red1, green1, blue1, alpha1;
4081 - gdouble offset;
4082 -
4083 - cairo_pattern_get_color_stop_rgba (p, i,
4084 - &offset,
4085 - &red1, &green1, &blue1,
4086 - &alpha1);
4087 - cairo_pattern_add_color_stop_rgba (new_pat, offset,
4088 - c->red + ((red1 - c->red) * progress),
4089 - c->green + ((green1 - c->green) * progress),
4090 - c->blue + ((blue1 - c->blue) * progress),
4091 - c->alpha + ((alpha1 - c->alpha) * progress));
4092 - }
4093 - }
4094 - else
4095 - {
4096 - /* just colors, create new colors blending them */
4097 - GdkRGBA *other_colors[4];
4098 -
4099 - gtk_theming_engine_get (engine, other_state,
4100 - "border-top-color", &other_colors[0],
4101 - "border-right-color", &other_colors[1],
4102 - "border-bottom-color", &other_colors[2],
4103 - "border-left-color", &other_colors[3],
4104 - NULL);
4105 -
4106 - for (i = 0; i < 4; i++)
4107 - {
4108 - colors[i]->red = CLAMP (colors[i]->red + ((other_colors[i]->red - colors[i]->red) * progress), 0, 1);
4109 - colors[i]->green = CLAMP (colors[i]->green + ((other_colors[i]->green - colors[i]->green) * progress), 0, 1);
4110 - colors[i]->blue = CLAMP (colors[i]->blue + ((other_colors[i]->blue - colors[i]->blue) * progress), 0, 1);
4111 - colors[i]->alpha = CLAMP (colors[i]->alpha + ((other_colors[i]->alpha - colors[i]->alpha) * progress), 0, 1);
4112 - gdk_rgba_free (other_colors[i]);
4113 - }
4114 - }
4115 -
4116 - if (new_pat)
4117 - {
4118 - /* replace pattern to use */
4119 - cairo_pattern_destroy (border_pat);
4120 - border_pat = new_pat;
4121 - }
4122 -
4123 - if (other_pat)
4124 - cairo_pattern_destroy (other_pat);
4125 - }
4126 -
4127 - switch (border_style)
4128 - {
4129 - default:
4130 - g_assert_not_reached ();
4131 - case GTK_BORDER_STYLE_NONE:
4132 - case GTK_BORDER_STYLE_SOLID:
4133 - break;
4134 - case GTK_BORDER_STYLE_INSET:
4135 - color_shade (colors[1], 1.8, colors[1]);
4136 - color_shade (colors[2], 1.8, colors[2]);
4137 - break;
4138 - case GTK_BORDER_STYLE_OUTSET:
4139 - color_shade (colors[0], 1.8, colors[0]);
4140 - color_shade (colors[3], 1.8, colors[3]);
4141 - break;
4142 - }
4143 -
4144 - /* create the path to fill */
4145 - _gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
4146 - _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
4147 - padding_box = border_box;
4148 - _gtk_rounded_box_shrink (&padding_box, border.top, border.right, border.bottom, border.left);
4149 -
4150 - cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
4151 -
4152 - switch (border_style)
4153 - {
4154 - default:
4155 - g_assert_not_reached ();
4156 - case GTK_BORDER_STYLE_NONE:
4157 - break;
4158 - case GTK_BORDER_STYLE_SOLID:
4159 - case GTK_BORDER_STYLE_INSET:
4160 - case GTK_BORDER_STYLE_OUTSET:
4161 -
4162 - if (border_pat)
4163 - {
4164 - /* pattern */
4165 - cairo_scale (cr, width, height);
4166 - cairo_set_source (cr, border_pat);
4167 - cairo_scale (cr, 1.0 / width, 1.0 / height);
4168 -
4169 - _gtk_rounded_box_path (&border_box, cr);
4170 - _gtk_rounded_box_path (&padding_box, cr);
4171 - cairo_fill (cr);
4172 - }
4173 - else if (gdk_rgba_equal (colors[0], colors[1]) &&
4174 - gdk_rgba_equal (colors[0], colors[2]) &&
4175 - gdk_rgba_equal (colors[0], colors[3]))
4176 - {
4177 - /* one color */
4178 - gdk_cairo_set_source_rgba (cr, colors[0]);
4179 -
4180 - _gtk_rounded_box_path (&border_box, cr);
4181 - _gtk_rounded_box_path (&padding_box, cr);
4182 - cairo_fill (cr);
4183 - }
4184 - else
4185 - {
4186 - for (i = 0; i < 4; i++)
4187 - {
4188 - /* different colors */
4189 - if (hidden_side & current_side[i])
4190 - continue;
4191 -
4192 - for (j = 0; j < 4; j++)
4193 - {
4194 - if (hidden_side & current_side[j])
4195 - continue;
4196 -
4197 - if (i == j ||
4198 - gdk_rgba_equal (colors[i], colors[j]))
4199 - {
4200 - /* we were already painted when i == j */
4201 - if (i > j)
4202 - break;
4203 -
4204 - if (j == 0)
4205 - _gtk_rounded_box_path_top (&border_box, &padding_box, cr);
4206 - else if (j == 1)
4207 - _gtk_rounded_box_path_right (&border_box, &padding_box, cr);
4208 - else if (j == 2)
4209 - _gtk_rounded_box_path_bottom (&border_box, &padding_box, cr);
4210 - else if (j == 3)
4211 - _gtk_rounded_box_path_left (&border_box, &padding_box, cr);
4212 - }
4213 - }
4214 - /* we were already painted when i == j */
4215 - if (i > j)
4216 - continue;
4217 -
4218 - gdk_cairo_set_source_rgba (cr, colors[i]);
4219 -
4220 - cairo_fill (cr);
4221 - }
4222 - }
4223 - break;
4224 - }
4225 -
4226 - cairo_restore (cr);
4227 -
4228 - if (border_pat)
4229 - cairo_pattern_destroy (border_pat);
4230 -
4231 - for (i = 0; i < 4; i++)
4232 - gdk_rgba_free (colors[i]);
4233 -}
4234 -
4235 -/* draw the inner stroke */
4236 -static void
4237 -draw_inner_stroke (GtkThemingEngine *engine,
4238 - cairo_t *cr,
4239 - gdouble x,
4240 - gdouble y,
4241 - gdouble width,
4242 - gdouble height,
4243 - guint hidden_side,
4244 - GtkJunctionSides junction)
4245 -{
4246 - GdkRGBA *colors[4];
4247 - GdkRGBA *inner_stroke_color;
4248 - GtkBorder *inner_border;
4249 - GtkRoundedBox border_box, padding_box;
4250 - GtkStateFlags state;
4251 - cairo_pattern_t *inner_stroke_pat;
4252 - static const guint current_side[4] = { SIDE_TOP, SIDE_RIGHT, SIDE_BOTTOM, SIDE_LEFT };
4253 - guint i, j;
4254 -
4255 - state = gtk_theming_engine_get_state (engine);
4256 -
4257 - gtk_theming_engine_get (engine, state,
4258 - "-unico-inner-stroke-color", &inner_stroke_color,
4259 - "-unico-inner-stroke-top-color", &colors[0],
4260 - "-unico-inner-stroke-right-color", &colors[1],
4261 - "-unico-inner-stroke-bottom-color", &colors[2],
4262 - "-unico-inner-stroke-left-color", &colors[3],
4263 - "-unico-inner-stroke-gradient", &inner_stroke_pat,
4264 - "-unico-inner-stroke-width", &inner_border,
4265 - NULL);
4266 -
4267 - hide_border_sides (inner_border, hidden_side);
4268 -
4269 - if (unico_gtk_border_is_zero (inner_border))
4270 - goto end_draw_inner_stroke;
4271 -
4272 - apply_default_color (colors, inner_stroke_color);
4273 -
4274 - cairo_save (cr);
4275 -
4276 - cairo_translate (cr, x, y);
4277 -
4278 - /* create the path to fill */
4279 - _gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
4280 - _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
4281 - padding_box = border_box;
4282 - _gtk_rounded_box_shrink (&padding_box, inner_border->top,
4283 - inner_border->right,
4284 - inner_border->bottom,
4285 - inner_border->left);
4286 -
4287 - cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
4288 -
4289 - if (inner_stroke_pat)
4290 - {
4291 - /* pattern */
4292 - cairo_scale (cr, width, height);
4293 - cairo_set_source (cr, inner_stroke_pat);
4294 - cairo_scale (cr, 1.0 / width, 1.0 / height);
4295 -
4296 - _gtk_rounded_box_path (&border_box, cr);
4297 - _gtk_rounded_box_path (&padding_box, cr);
4298 - cairo_fill (cr);
4299 - }
4300 - else if (gdk_rgba_equal (colors[0], colors[1]) &&
4301 - gdk_rgba_equal (colors[0], colors[2]) &&
4302 - gdk_rgba_equal (colors[0], colors[3]))
4303 - {
4304 - /* one color */
4305 - gdk_cairo_set_source_rgba (cr, colors[0]);
4306 -
4307 - _gtk_rounded_box_path (&border_box, cr);
4308 - _gtk_rounded_box_path (&padding_box, cr);
4309 - cairo_fill (cr);
4310 - }
4311 - else
4312 - {
4313 - /* different colors */
4314 - for (i = 0; i < 4; i++)
4315 - {
4316 - if (hidden_side & current_side[i])
4317 - continue;
4318 -
4319 - for (j = 0; j < 4; j++)
4320 - {
4321 - if (hidden_side & current_side[j])
4322 - continue;
4323 -
4324 - if (i == j ||
4325 - gdk_rgba_equal (colors[i], colors[j]))
4326 - {
4327 - /* we were already painted when i == j */
4328 - if (i > j)
4329 - break;
4330 -
4331 - if (j == 0)
4332 - _gtk_rounded_box_path_top (&border_box, &padding_box, cr);
4333 - else if (j == 1)
4334 - _gtk_rounded_box_path_right (&border_box, &padding_box, cr);
4335 - else if (j == 2)
4336 - _gtk_rounded_box_path_bottom (&border_box, &padding_box, cr);
4337 - else if (j == 3)
4338 - _gtk_rounded_box_path_left (&border_box, &padding_box, cr);
4339 - }
4340 - }
4341 - /* we were already painted when i == j */
4342 - if (i > j)
4343 - continue;
4344 -
4345 - gdk_cairo_set_source_rgba (cr, colors[i]);
4346 -
4347 - cairo_fill (cr);
4348 - }
4349 - }
4350 -
4351 - cairo_restore (cr);
4352 -
4353 -end_draw_inner_stroke:
4354 - gtk_border_free (inner_border);
4355 -
4356 - if (inner_stroke_pat != NULL)
4357 - cairo_pattern_destroy (inner_stroke_pat);
4358 -
4359 - gdk_rgba_free (inner_stroke_color);
4360 -
4361 - for (i = 0; i < 4; i++)
4362 - gdk_rgba_free (colors[i]);
4363 -}
4364 -
4365 -/* draw the outer stroke */
4366 -static void
4367 -draw_outer_stroke (GtkThemingEngine *engine,
4368 - cairo_t *cr,
4369 - gdouble x,
4370 - gdouble y,
4371 - gdouble width,
4372 - gdouble height,
4373 - guint hidden_side,
4374 - GtkJunctionSides junction)
4375 -{
4376 - GdkRGBA *outer_stroke_color;
4377 - GdkRGBA *colors[4];
4378 - GtkBorder *outer_border;
4379 - GtkRoundedBox border_box, padding_box;
4380 - GtkStateFlags state;
4381 - cairo_pattern_t *outer_stroke_pat;
4382 - static const guint current_side[4] = { SIDE_TOP, SIDE_RIGHT, SIDE_BOTTOM, SIDE_LEFT };
4383 - guint i, j;
4384 -
4385 - state = gtk_theming_engine_get_state (engine);
4386 -
4387 - gtk_theming_engine_get (engine, state,
4388 - "-unico-outer-stroke-color", &outer_stroke_color,
4389 - "-unico-outer-stroke-top-color", &colors[0],
4390 - "-unico-outer-stroke-right-color", &colors[1],
4391 - "-unico-outer-stroke-bottom-color", &colors[2],
4392 - "-unico-outer-stroke-left-color", &colors[3],
4393 - "-unico-outer-stroke-gradient", &outer_stroke_pat,
4394 - "-unico-outer-stroke-width", &outer_border,
4395 - NULL);
4396 -
4397 - hide_border_sides (outer_border, hidden_side);
4398 -
4399 - if (unico_gtk_border_is_zero (outer_border))
4400 - goto end_draw_outer_stroke;
4401 -
4402 - apply_default_color (colors, outer_stroke_color);
4403 -
4404 - cairo_save (cr);
4405 -
4406 - cairo_translate (cr, x, y);
4407 -
4408 - /* create the path to fill */
4409 - _gtk_rounded_box_init_rect (&border_box, 0, 0, width, height);
4410 - _gtk_rounded_box_apply_border_radius (&border_box, engine, state, junction);
4411 - padding_box = border_box;
4412 - _gtk_rounded_box_shrink (&padding_box, outer_border->top,
4413 - outer_border->right,
4414 - outer_border->bottom,
4415 - outer_border->left);
4416 -
4417 - cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
4418 -
4419 - if (outer_stroke_pat)
4420 - {
4421 - /* pattern */
4422 - cairo_scale (cr, width, height);
4423 - cairo_set_source (cr, outer_stroke_pat);
4424 - cairo_scale (cr, 1.0 / width, 1.0 / height);
4425 -
4426 - _gtk_rounded_box_path (&border_box, cr);
4427 - _gtk_rounded_box_path (&padding_box, cr);
4428 - cairo_fill (cr);
4429 - }
4430 - else if (gdk_rgba_equal (colors[0], colors[1]) &&
4431 - gdk_rgba_equal (colors[0], colors[2]) &&
4432 - gdk_rgba_equal (colors[0], colors[3]))
4433 - {
4434 - /* one color */
4435 - gdk_cairo_set_source_rgba (cr, colors[0]);
4436 -
4437 - _gtk_rounded_box_path (&border_box, cr);
4438 - _gtk_rounded_box_path (&padding_box, cr);
4439 - cairo_fill (cr);
4440 - }
4441 - else
4442 - {
4443 - /* different colors */
4444 - for (i = 0; i < 4; i++)
4445 - {
4446 - if (hidden_side & current_side[i])
4447 - continue;
4448 -
4449 - for (j = 0; j < 4; j++)
4450 - {
4451 - if (hidden_side & current_side[j])
4452 - continue;
4453 -
4454 - if (i == j ||
4455 - gdk_rgba_equal (colors[i], colors[j]))
4456 - {
4457 - /* we were already painted when i == j */
4458 - if (i > j)
4459 - break;
4460 -
4461 - if (j == 0)
4462 - _gtk_rounded_box_path_top (&border_box, &padding_box, cr);
4463 - else if (j == 1)
4464 - _gtk_rounded_box_path_right (&border_box, &padding_box, cr);
4465 - else if (j == 2)
4466 - _gtk_rounded_box_path_bottom (&border_box, &padding_box, cr);
4467 - else if (j == 3)
4468 - _gtk_rounded_box_path_left (&border_box, &padding_box, cr);
4469 - }
4470 - }
4471 - /* we were already painted when i == j */
4472 - if (i > j)
4473 - continue;
4474 -
4475 - gdk_cairo_set_source_rgba (cr, colors[i]);
4476 -
4477 - cairo_fill (cr);
4478 - }
4479 - }
4480 -
4481 - cairo_restore (cr);
4482 -
4483 -end_draw_outer_stroke:
4484 - gtk_border_free (outer_border);
4485 -
4486 - if (outer_stroke_pat != NULL)
4487 - cairo_pattern_destroy (outer_stroke_pat);
4488 -
4489 - gdk_rgba_free (outer_stroke_color);
4490 -
4491 - for (i = 0; i < 4; i++)
4492 - gdk_rgba_free (colors[i]);
4493 -}
4494 -
4495 -void
4496 -unico_cairo_draw_frame (GtkThemingEngine *engine,
4497 - cairo_t *cr,
4498 - gdouble x,
4499 - gdouble y,
4500 - gdouble width,
4501 - gdouble height,
4502 - guint hidden_side,
4503 - GtkJunctionSides junction)
4504 -{
4505 - GtkBorder border;
4506 - GtkBorder *outer_border;
4507 - GtkStateFlags state;
4508 -
4509 - state = gtk_theming_engine_get_state (engine);
4510 -
4511 - gtk_theming_engine_get (engine, state,
4512 - "-unico-outer-stroke-width", &outer_border,
4513 - NULL);
4514 - gtk_theming_engine_get_border (engine, state, &border);
4515 -
4516 - hide_border_sides (&border, hidden_side);
4517 - hide_border_sides (outer_border, hidden_side);
4518 -
4519 - if (!unico_gtk_border_is_zero (outer_border))
4520 - {
4521 - /* first layer, outer stroke */
4522 - draw_outer_stroke (engine, cr,
4523 - x, y,
4524 - width, height,
4525 - hidden_side, junction);
4526 -
4527 - shrink_with_border (outer_border, &x, &y, &width, &height);
4528 - }
4529 -
4530 - /* second layer, inner stroke */
4531 - if (width - (border.left + border.right) > 0 &&
4532 - height - (border.top + border.bottom) > 0)
4533 - draw_inner_stroke (engine, cr,
4534 - x + border.left, y + border.top,
4535 - width - (border.left + border.right), height - (border.top + border.bottom),
4536 - hidden_side, junction);
4537 -
4538 - /* third layer, border */
4539 - draw_border (engine, cr,
4540 - x, y,
4541 - width, height,
4542 - hidden_side, junction);
4543 -
4544 - gtk_border_free (outer_border);
4545 -}
4546 -
4547 -gboolean
4548 -unico_cairo_draw_from_texture (GtkThemingEngine *engine,
4549 - cairo_t *cr,
4550 - gdouble x,
4551 - gdouble y,
4552 - gdouble width,
4553 - gdouble height)
4554 -{
4555 - GtkStateFlags state;
4556 - GValue value = { 0, };
4557 - cairo_pattern_t *texture = NULL;
4558 - cairo_surface_t *surface = NULL;
4559 - gboolean retval = FALSE;
4560 -
4561 - state = gtk_theming_engine_get_state (engine);
4562 -
4563 - gtk_theming_engine_get_property (engine, "background-image", state, &value);
4564 -
4565 - if (!G_VALUE_HOLDS_BOXED (&value))
4566 - return FALSE;
4567 -
4568 - texture = g_value_dup_boxed (&value);
4569 - g_value_unset (&value);
4570 -
4571 - if (texture != NULL)
4572 - cairo_pattern_get_surface (texture, &surface);
4573 -
4574 - if (surface != NULL)
4575 - {
4576 - cairo_save (cr);
4577 -
4578 - cairo_scale (cr, width / cairo_image_surface_get_width (surface),
4579 - height / cairo_image_surface_get_height (surface));
4580 - cairo_set_source_surface (cr, surface, x, y);
4581 -
4582 - cairo_paint (cr);
4583 -
4584 - cairo_restore (cr);
4585 -
4586 - retval = TRUE;
4587 - }
4588 -
4589 - if (texture != NULL)
4590 - cairo_pattern_destroy (texture);
4591 -
4592 - return retval;
4593 -}
4594 -
4595 void
4596 unico_cairo_round_rect (cairo_t *cr,
4597 gdouble x,
4598 @@ -1257,7 +46,7 @@
4599 else
4600 {
4601 cairo_new_sub_path (cr);
4602 -
4603 +
4604 cairo_arc (cr, x + width - radius, y + radius, radius, - G_PI / 4, 0);
4605 }
4607 @@ -1352,71 +141,3 @@
4608 height - line_width,
4609 radius, sides, junction);
4610 }
4611 -
4612 -void
4613 -unico_cairo_set_source_border (GtkThemingEngine *engine,
4614 - cairo_t *cr,
4615 - gdouble width,
4616 - gdouble height)
4617 -{
4618 - GdkRGBA border_color;
4619 - GtkBorderStyle border_style;
4620 - GtkStateFlags state;
4621 - cairo_pattern_t *border_pat;
4622 -
4623 - state = gtk_theming_engine_get_state (engine);
4624 -
4625 - gtk_theming_engine_get (engine, state,
4626 - "border-style", &border_style,
4627 - "-unico-border-gradient", &border_pat,
4628 - NULL);
4629 - gtk_theming_engine_get_border_color (engine, state, &border_color);
4630 -
4631 - if (border_pat)
4632 - {
4633 - /* pattern */
4634 - cairo_scale (cr, width, height);
4635 - cairo_set_source (cr, border_pat);
4636 - cairo_scale (cr, 1.0 / width, 1.0 / height);
4637 - }
4638 - else
4639 - /* one color */
4640 - gdk_cairo_set_source_rgba (cr, &border_color);
4641 -
4642 - if (border_pat != NULL)
4643 - cairo_pattern_destroy (border_pat);
4644 -}
4645 -
4646 -void
4647 -unico_cairo_set_source_inner_stroke (GtkThemingEngine *engine,
4648 - cairo_t *cr,
4649 - gdouble width,
4650 - gdouble height)
4651 -{
4652 - GdkRGBA *inner_stroke_color;
4653 - GtkStateFlags state;
4654 - cairo_pattern_t *inner_stroke_pat;
4655 -
4656 - state = gtk_theming_engine_get_state (engine);
4657 -
4658 - gtk_theming_engine_get (engine, state,
4659 - "-unico-inner-stroke-color", &inner_stroke_color,
4660 - "-unico-inner-stroke-gradient", &inner_stroke_pat,
4661 - NULL);
4662 -
4663 - if (inner_stroke_pat)
4664 - {
4665 - /* pattern */
4666 - cairo_scale (cr, width, height);
4667 - cairo_set_source (cr, inner_stroke_pat);
4668 - cairo_scale (cr, 1.0 / width, 1.0 / height);
4669 - }
4670 - else
4671 - /* one color */
4672 - gdk_cairo_set_source_rgba (cr, inner_stroke_color);
4673 -
4674 - if (inner_stroke_pat != NULL)
4675 - cairo_pattern_destroy (inner_stroke_pat);
4676 -
4677 - gdk_rgba_free (inner_stroke_color);
4678 -}
4680 === modified file 'unico/unico-cairo-support.h'
4681 --- unico/unico-cairo-support.h 2011-08-06 15:38:52 +0000
4682 +++ unico/unico-cairo-support.h 2016-01-19 12:14:18 +0000
4683 @@ -1,10 +1,9 @@
4684 /* The Unico Theming Engine for Gtk+.
4685 * Copyright (C) 2011 Canonical Ltd
4686 *
4687 - * This library is free software; you can redistribute it and/or
4688 - * modify it under the terms of the GNU Lesser General Public
4689 - * License as published by the Free Software Foundation; either
4690 - * version 2 of the License, or (at your option) any later version.
4691 + * This library is free software; you can redistribute it and/or modify
4692 + * it under the terms of the GNU Lesser General Public License
4693 + * version 2.1 as published by the Free Software Foundation.
4694 *
4695 * This library is distributed in the hope that it will be useful,
4696 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4697 @@ -27,31 +26,6 @@
4699 G_BEGIN_DECLS
4701 -G_GNUC_INTERNAL void unico_cairo_draw_background (GtkThemingEngine *engine,
4702 - cairo_t *cr,
4703 - gdouble x,
4704 - gdouble y,
4705 - gdouble width,
4706 - gdouble height,
4707 - guint hidden_side,
4708 - GtkJunctionSides junction);
4709 -
4710 -G_GNUC_INTERNAL void unico_cairo_draw_frame (GtkThemingEngine *engine,
4711 - cairo_t *cr,
4712 - gdouble x,
4713 - gdouble y,
4714 - gdouble width,
4715 - gdouble height,
4716 - guint hidden_side,
4717 - GtkJunctionSides junction);
4718 -
4719 -G_GNUC_INTERNAL gboolean unico_cairo_draw_from_texture (GtkThemingEngine *engine,
4720 - cairo_t *cr,
4721 - gdouble x,
4722 - gdouble y,
4723 - gdouble width,
4724 - gdouble height);
4725 -
4726 G_GNUC_INTERNAL void unico_cairo_round_rect (cairo_t *cr,
4727 gdouble x,
4728 gdouble y,
4729 @@ -70,16 +44,6 @@
4730 guint sides,
4731 GtkJunctionSides junction);
4733 -G_GNUC_INTERNAL void unico_cairo_set_source_border (GtkThemingEngine *engine,
4734 - cairo_t *cr,
4735 - gdouble width,
4736 - gdouble height);
4737 -
4738 -G_GNUC_INTERNAL void unico_cairo_set_source_inner_stroke (GtkThemingEngine *engine,
4739 - cairo_t *cr,
4740 - gdouble width,
4741 - gdouble height);
4742 -
4743 G_END_DECLS
4745 #endif /* UNICO_CAIRO_SUPPORT_H */
4747 === modified file 'unico/unico-draw.c'
4748 --- unico/unico-draw.c 2012-03-29 14:25:06 +0000
4749 +++ unico/unico-draw.c 2016-01-19 12:14:18 +0000
4750 @@ -1,10 +1,9 @@
4751 /* The Unico Theming Engine for Gtk+.
4752 * Copyright (C) 2011 Canonical Ltd
4753 *
4754 - * This library is free software; you can redistribute it and/or
4755 - * modify it under the terms of the GNU Lesser General Public
4756 - * License as published by the Free Software Foundation; either
4757 - * version 2 of the License, or (at your option) any later version.
4758 + * This library is free software; you can redistribute it and/or modify
4759 + * it under the terms of the GNU Lesser General Public License
4760 + * version 2.1 as published by the Free Software Foundation.
4761 *
4762 * This library is distributed in the hope that it will be useful,
4763 * but WITHOUT ANY WARRANTY; without even the implied warranty of
4764 @@ -28,16 +27,14 @@
4765 #include "unico-draw.h"
4766 #include "unico-support.h"
4767 #include "unico-types.h"
4768 -#include "gtkroundedboxprivate.h"
4770 -/* draw a texture placed on the centroid */
4771 static gboolean
4772 -draw_centroid_texture (GtkThemingEngine *engine,
4773 - cairo_t *cr,
4774 - gdouble x,
4775 - gdouble y,
4776 - gdouble width,
4777 - gdouble height)
4778 +draw_arrow_texture (GtkThemingEngine *engine,
4779 + cairo_t *cr,
4780 + gdouble angle,
4781 + gdouble x,
4782 + gdouble y,
4783 + gdouble size)
4784 {
4785 GtkStateFlags state;
4786 GValue value = { 0, };
4787 @@ -47,7 +44,7 @@
4789 state = gtk_theming_engine_get_state (engine);
4791 - gtk_theming_engine_get_property (engine, "-unico-centroid-texture", state, &value);
4792 + gtk_theming_engine_get_property (engine, "-unico-arrow-texture", state, &value);
4794 if (!G_VALUE_HOLDS_BOXED (&value))
4795 return FALSE;
4796 @@ -62,8 +59,11 @@
4797 {
4798 cairo_save (cr);
4800 - cairo_set_source_surface (cr, surface, (gint) (x + width / 2 - cairo_image_surface_get_width (surface) / 2),
4801 - (gint) (y + height / 2 - cairo_image_surface_get_height (surface) / 2));
4802 + cairo_translate (cr, (gint) (x + size / 2), (gint) (y + size / 2));
4803 + cairo_rotate (cr, angle);
4804 +
4805 + cairo_set_source_surface (cr, surface, - cairo_image_surface_get_width (surface) / 2,
4806 + - cairo_image_surface_get_height (surface) / 2);
4807 cairo_paint (cr);
4809 cairo_restore (cr);
4810 @@ -78,18 +78,6 @@
4811 }
4813 static void
4814 -unico_draw_activity (DRAW_ARGS)
4815 -{
4816 - /* playground for effects */
4817 - unico_cairo_draw_background (engine, cr,
4818 - x, y, width, height,
4819 - 0, gtk_theming_engine_get_junction_sides (engine));
4820 - unico_cairo_draw_frame (engine, cr,
4821 - x, y, width, height,
4822 - 0, gtk_theming_engine_get_junction_sides (engine));
4823 -}
4824 -
4825 -static void
4826 unico_draw_arrow (GtkThemingEngine *engine,
4827 cairo_t *cr,
4828 gdouble angle,
4829 @@ -101,6 +89,9 @@
4830 GdkRGBA color;
4831 gdouble size_reduction = 4;
4833 + if (draw_arrow_texture (engine, cr, angle, x, y, size))
4834 + return;
4835 +
4836 state = gtk_theming_engine_get_state (engine);
4838 gtk_theming_engine_get_color (engine, state, &color);
4839 @@ -134,191 +125,6 @@
4840 }
4842 static void
4843 -unico_draw_cell_background (DRAW_ARGS,
4844 - GtkRegionFlags flags)
4845 -{
4846 - GtkJunctionSides junction;
4847 - guint hidden_side;
4848 -
4849 - junction = GTK_JUNCTION_RIGHT | GTK_JUNCTION_LEFT;
4850 -
4851 - hidden_side = SIDE_RIGHT | SIDE_LEFT;
4852 -
4853 - if ((flags & GTK_REGION_FIRST) != 0)
4854 - {
4855 - junction &= ~(GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMLEFT);
4856 - hidden_side &= ~(SIDE_LEFT);
4857 - }
4858 - if ((flags & GTK_REGION_LAST) != 0)
4859 - {
4860 - junction &= ~(GTK_JUNCTION_CORNER_TOPRIGHT | GTK_JUNCTION_CORNER_BOTTOMRIGHT);
4861 - hidden_side &= ~(SIDE_RIGHT);
4862 - }
4863 -
4864 - unico_cairo_draw_background (engine, cr,
4865 - x, y, width, height,
4866 - hidden_side, junction);
4867 -}
4868 -
4869 -static void
4870 -unico_draw_cell_frame (DRAW_ARGS,
4871 - GtkRegionFlags flags)
4872 -{
4873 - GtkJunctionSides junction;
4874 - guint hidden_side;
4875 -
4876 - junction = GTK_JUNCTION_RIGHT | GTK_JUNCTION_LEFT;
4877 -
4878 - hidden_side = SIDE_RIGHT | SIDE_LEFT;
4879 -
4880 - if ((flags & GTK_REGION_FIRST) != 0)
4881 - {
4882 - junction &= ~(GTK_JUNCTION_CORNER_TOPLEFT | GTK_JUNCTION_CORNER_BOTTOMLEFT);
4883 - hidden_side &= ~(SIDE_LEFT);
4884 - }
4885 - if ((flags & GTK_REGION_LAST) != 0)
4886 - {
4887 - junction &= ~(GTK_JUNCTION_CORNER_TOPRIGHT | GTK_JUNCTION_CORNER_BOTTOMRIGHT);
4888 - hidden_side &= ~(SIDE_RIGHT);
4889 - }
4890 -
4891 - unico_cairo_draw_frame (engine, cr,
4892 - x, y, width, height,
4893 - hidden_side, junction);
4894 -}
4895 -
4896 -static void
4897 -unico_draw_check (DRAW_ARGS)
4898 -{
4899 - GtkStateFlags state;
4900 - gboolean in_menu;
4901 - gboolean draw_bullet, inconsistent;
4902 -
4903 - state = gtk_theming_engine_get_state (engine);
4904 -
4905 - in_menu = gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_MENUITEM);
4906 - inconsistent = (state & GTK_STATE_FLAG_INCONSISTENT) != 0;
4907 - draw_bullet = (state & GTK_STATE_FLAG_ACTIVE) != 0;
4908 - draw_bullet |= inconsistent;
4909 -
4910 - if (!in_menu)
4911 - {
4912 - unico_cairo_draw_background (engine, cr,
4913 - x, y, width, height,
4914 - 0, gtk_theming_engine_get_junction_sides (engine));
4915 - unico_cairo_draw_frame (engine, cr,
4916 - x, y, width, height,
4917 - 0, gtk_theming_engine_get_junction_sides (engine));
4918 - }
4919 -
4920 - if (draw_bullet)
4921 - {
4922 - GdkRGBA *bullet_color;
4923 -
4924 - gtk_theming_engine_get (engine, state,
4925 - "-unico-bullet-color", &bullet_color,
4926 - NULL);
4927 -
4928 - cairo_translate (cr, x, y);
4929 - cairo_scale (cr, width / 18.0, height / 18.0);
4930 -
4931 - if (inconsistent)
4932 - {
4933 - GdkRGBA *bullet_outline_color;
4934 -
4935 - gtk_theming_engine_get (engine, state,
4936 - "-unico-bullet-outline-color", &bullet_outline_color,
4937 - NULL);
4938 -
4939 - /* thick's outline */
4940 - cairo_rectangle (cr, 3.5, 7, 11, 4);
4941 -
4942 - gdk_cairo_set_source_rgba (cr, bullet_outline_color);
4943 - cairo_fill (cr);
4944 -
4945 - cairo_rectangle (cr, 4.5, 8, 9, 2);
4946 -
4947 - gdk_rgba_free (bullet_outline_color);
4948 - }
4949 - else
4950 - {
4951 - if (in_menu)
4952 - cairo_translate (cr, 2.0, 3.0);
4953 - else
4954 - {
4955 - GdkRGBA *bullet_outline_color;
4956 -
4957 - gtk_theming_engine_get (engine, state,
4958 - "-unico-bullet-outline-color", &bullet_outline_color,
4959 - NULL);
4960 -
4961 - /* thick's outline */
4962 - cairo_move_to (cr, 5.0, 5.65);
4963 - cairo_line_to (cr, 8.95, 9.57);
4964 - cairo_line_to (cr, 16.0, 2.54);
4965 - cairo_line_to (cr, 16.0, 8.36);
4966 - cairo_line_to (cr, 10.6, 15.1);
4967 - cairo_line_to (cr, 7.6, 15.1);
4968 - cairo_line_to (cr, 2.95, 10.48);
4969 - cairo_line_to (cr, 2.95, 7.65);
4970 - cairo_close_path (cr);
4971 -
4972 - gdk_cairo_set_source_rgba (cr, bullet_outline_color);
4973 - cairo_fill (cr);
4974 -
4975 - cairo_translate (cr, 4.0, 2.0);
4976 -
4977 - gdk_rgba_free (bullet_outline_color);
4978 - }
4979 -
4980 - /* thick */
4981 - cairo_move_to (cr, 0.0, 6.0);
4982 - cairo_line_to (cr, 0.0, 8.0);
4983 - cairo_line_to (cr, 4.0, 12.0);
4984 - cairo_line_to (cr, 6.0, 12.0);
4985 - cairo_line_to (cr, 15.0, 1.0);
4986 - cairo_line_to (cr, 15.0, 0.0);
4987 - cairo_line_to (cr, 14.0, 0.0);
4988 - cairo_line_to (cr, 5.0, 9.0);
4989 - cairo_line_to (cr, 1.0, 5.0);
4990 - cairo_close_path (cr);
4991 - }
4992 -
4993 - gdk_cairo_set_source_rgba (cr, bullet_color);
4994 - cairo_fill (cr);
4995 -
4996 - gdk_rgba_free (bullet_color);
4997 - }
4998 -}
4999 -
5000 -static void
5001 -unico_draw_common (DRAW_ARGS)
5002 -{
5003 - unico_cairo_draw_background (engine, cr,
5004 - x, y, width, height,
5005 - 0, gtk_theming_engine_get_junction_sides (engine));
5006 - unico_cairo_draw_frame (engine, cr,
5007 - x, y, width, height,
5008 - 0, gtk_theming_engine_get_junction_sides (engine));
5009 -}
5010 -
5011 -static void
5012 -unico_draw_common_background (DRAW_ARGS)
5013 -{
5014 - unico_cairo_draw_background (engine, cr,
5015 - x, y, width, height,
5016 - 0, gtk_theming_engine_get_junction_sides (engine));
5017 -}
5018 -
5019 -static void
5020 -unico_draw_common_frame (DRAW_ARGS)
5021 -{
5022 - unico_cairo_draw_frame (engine, cr,
5023 - x, y, width, height,
5024 - 0, gtk_theming_engine_get_junction_sides (engine));
5025 -}
5026 -
5027 -static void
5028 unico_draw_expander (DRAW_ARGS)
5029 {
5030 GtkStateFlags state;
5031 @@ -359,132 +165,35 @@
5032 }
5034 static void
5035 -unico_draw_extension (DRAW_ARGS,
5036 - GtkPositionType gap_side)
5037 -{
5038 - GtkBorder border;
5039 - GtkBorder *outer_border;
5040 - GtkJunctionSides junction = 0;
5041 - GtkStateFlags state;
5042 - gboolean has_outer_stroke = FALSE;
5043 - gdouble bg_offset = 0;
5044 - guint hidden_side = 0;
5045 -
5046 - state = gtk_theming_engine_get_state (engine);
5047 -
5048 - gtk_theming_engine_get (engine, state,
5049 - "-unico-outer-stroke-width", &outer_border,
5050 - NULL);
5051 - gtk_theming_engine_get_border (engine, state, &border);
5052 -
5053 - if (!unico_gtk_border_is_zero (outer_border))
5054 - has_outer_stroke = TRUE;
5055 -
5056 - cairo_save (cr);
5057 -
5058 - /* FIXME doesn't work properly with not homogenuos border-width,
5059 - * especially between tab and notebook.
5060 - * I guess the issue comes from the fact draw_background
5061 - * is looking at border dimensions while we're not,
5062 - * or we're doing it wrong.
5063 - * draw_background is looking at SIDE_BOTTOM and
5064 - * sets border to 0 for this side */
5065 - switch (gap_side)
5066 - {
5067 - case GTK_POS_TOP:
5068 - junction = GTK_JUNCTION_TOP;
5069 - hidden_side = SIDE_TOP;
5070 -
5071 - if (has_outer_stroke)
5072 - {
5073 - y -= outer_border->bottom;
5074 - height += outer_border->bottom;
5075 - }
5076 -
5077 - if ((state & GTK_STATE_FLAG_ACTIVE) != 0)
5078 - bg_offset = border.bottom;
5079 -
5080 - cairo_translate (cr, x + width, y + height);
5081 - cairo_rotate (cr, G_PI);
5082 - break;
5083 - default:
5084 - case GTK_POS_BOTTOM:
5085 - junction = GTK_JUNCTION_BOTTOM;
5086 - hidden_side = SIDE_BOTTOM;
5087 -
5088 - if (has_outer_stroke)
5089 - height += outer_border->top;
5090 -
5091 - if ((state & GTK_STATE_FLAG_ACTIVE) != 0)
5092 - bg_offset = border.top;
5093 -
5094 - cairo_translate (cr, x, y);
5095 - break;
5096 - case GTK_POS_LEFT:
5097 - junction = GTK_JUNCTION_LEFT;
5098 - hidden_side = SIDE_LEFT;
5099 -
5100 - if (has_outer_stroke)
5101 - {
5102 - x -= outer_border->right;
5103 - width += outer_border->right;
5104 - }
5105 -
5106 - if ((state & GTK_STATE_FLAG_ACTIVE) != 0)
5107 - bg_offset = border.right;
5108 -
5109 - cairo_translate (cr, x + width, y);
5110 - cairo_rotate (cr, G_PI / 2);
5111 - break;
5112 - case GTK_POS_RIGHT:
5113 - junction = GTK_JUNCTION_RIGHT;
5114 - hidden_side = SIDE_RIGHT;
5115 -
5116 - if (has_outer_stroke)
5117 - width += outer_border->left;
5118 -
5119 - if ((state & GTK_STATE_FLAG_ACTIVE) != 0)
5120 - bg_offset = border.left;
5121 -
5122 - cairo_translate (cr, x, y + height);
5123 - cairo_rotate (cr, - G_PI / 2);
5124 - break;
5125 - }
5126 -
5127 - if (gap_side == GTK_POS_TOP ||
5128 - gap_side == GTK_POS_BOTTOM)
5129 - unico_cairo_draw_background (engine, cr, 0, 0, width, height + bg_offset, SIDE_BOTTOM, GTK_JUNCTION_BOTTOM);
5130 - else
5131 - unico_cairo_draw_background (engine, cr, 0, 0, height, width + bg_offset, SIDE_BOTTOM, GTK_JUNCTION_BOTTOM);
5132 - cairo_restore (cr);
5133 -
5134 - /* FIXME the frame on bottom bar has the wrong gradient,
5135 - * while should be reflected */
5136 - unico_cairo_draw_frame (engine, cr, x, y, width, height, hidden_side, junction);
5137 -
5138 - gtk_border_free (outer_border);
5139 -}
5140 -
5141 -static void
5142 unico_draw_focus (DRAW_ARGS)
5143 {
5144 - GdkRGBA *fill_color, *border_color, *outer_stroke_color;
5145 + GdkRGBA *fill_color, *border_color;
5146 GtkStateFlags state;
5147 gint focus_pad, line_width;
5148 gint radius;
5150 state = gtk_theming_engine_get_state (engine);
5152 - gtk_theming_engine_get (engine, state,
5153 - "-unico-focus-border-color", &border_color,
5154 - "-unico-focus-border-radius", &radius,
5155 - "-unico-focus-fill-color", &fill_color,
5156 - "-unico-focus-outer-stroke-color", &outer_stroke_color,
5157 - NULL);
5158 gtk_theming_engine_get_style (engine,
5159 "focus-padding", &focus_pad,
5160 "focus-line-width", &line_width,
5161 - NULL);
5162 + NULL);
5163 +
5164 + /* Skip rendering if focus-line-width is 0 or less. */
5165 + if (line_width < 1)
5166 + return;
5167 +
5168 + /* Use the outline attributes for the focus properties to avoid using
5169 + * custom attributes. Outlines don't have a fill, so hardcode the fill
5170 + * color to be the same color as the border, but with 20% of its alpha.
5171 + */
5172 + gtk_theming_engine_get (engine, state,
5173 + "outline-color", &border_color,
5174 + "outline-offset", &radius,
5175 + NULL);
5176 +
5177 + fill_color = gdk_rgba_copy (border_color);
5178 + fill_color->alpha = border_color->alpha * 0.2;
5180 x += focus_pad;
5181 y += focus_pad;
5182 @@ -502,14 +211,7 @@
5183 gdk_cairo_set_source_rgba (cr, fill_color);
5184 cairo_fill (cr);
5186 - /* second layer, outer stroke */
5187 - unico_cairo_round_rect_inner (cr, x - line_width, y - line_width,
5188 - width + line_width * 2, height + line_width * 2,
5189 - radius + 1, SIDE_ALL, GTK_JUNCTION_NONE);
5190 - gdk_cairo_set_source_rgba (cr, outer_stroke_color);
5191 - cairo_stroke (cr);
5192 -
5193 - /* third layer, border */
5194 + /* second layer, border */
5195 unico_cairo_round_rect_inner (cr, x, y,
5196 width, height,
5197 radius, SIDE_ALL, GTK_JUNCTION_NONE);
5198 @@ -520,525 +222,6 @@
5200 gdk_rgba_free (border_color);
5201 gdk_rgba_free (fill_color);
5202 - gdk_rgba_free (outer_stroke_color);
5203 -}
5204 -
5205 -static void
5206 -unico_draw_frame_gap (DRAW_ARGS,
5207 - GtkPositionType gap_side,
5208 - gdouble xy0_gap,
5209 - gdouble xy1_gap)
5210 -{
5211 - GtkBorder border;
5212 - GtkBorder *outer_border;
5213 - GtkCssBorderCornerRadius *top_left_radius, *top_right_radius;
5214 - GtkCssBorderCornerRadius *bottom_left_radius, *bottom_right_radius;
5215 - GtkJunctionSides junction;
5216 - GtkStateFlags state;
5217 - gboolean has_outer_stroke = FALSE;
5218 - gdouble x0, y0, x1, y1, xc, yc, wc, hc;
5219 -
5220 - xc = yc = wc = hc = 0;
5221 -
5222 - junction = gtk_theming_engine_get_junction_sides (engine);
5223 -
5224 - state = gtk_theming_engine_get_state (engine);
5225 -
5226 - gtk_theming_engine_get (engine, state,
5227 - /* Can't use border-radius as it's an int for
5228 - * backwards compat */
5229 - "border-top-left-radius", &top_left_radius,
5230 - "border-top-right-radius", &top_right_radius,
5231 - "border-bottom-right-radius", &bottom_right_radius,
5232 - "border-bottom-left-radius", &bottom_left_radius,
5233 - "-unico-outer-stroke-width", &outer_border,
5234 - NULL);
5235 - gtk_theming_engine_get_border (engine, state, &border);
5236 -
5237 - if (!unico_gtk_border_is_zero (outer_border))
5238 - has_outer_stroke = TRUE;
5239 -
5240 - cairo_save (cr);
5241 -
5242 - switch (gap_side)
5243 - {
5244 - case GTK_POS_TOP:
5245 - xc = x + xy0_gap + border.left;
5246 - yc = y;
5247 - wc = MAX (xy1_gap - xy0_gap - (border.left + border.right), 0);
5248 - hc = border.top * 2;
5249 -
5250 - if (has_outer_stroke)
5251 - {
5252 - xc += outer_border->left;
5253 - wc = MAX (xy1_gap - xy0_gap - (outer_border->left + outer_border->right) - (border.left + border.right), 0);
5254 - hc += outer_border->top;
5255 - }
5256 -
5257 - if (xy0_gap < _gtk_css_number_get (&top_left_radius->horizontal, width))
5258 - junction |= GTK_JUNCTION_CORNER_TOPLEFT;
5259 -
5260 - if (xy1_gap > width - _gtk_css_number_get (&top_right_radius->horizontal, width))
5261 - junction |= GTK_JUNCTION_CORNER_TOPRIGHT;
5262 -
5263 - break;
5264 - default:
5265 - case GTK_POS_BOTTOM:
5266 - xc = x + xy0_gap + border.left;
5267 - yc = y + height - border.bottom * 2;
5268 - wc = MAX (xy1_gap - xy0_gap - (border.left + border.right), 0);
5269 - hc = border.bottom * 2;
5270 -
5271 - if (has_outer_stroke)
5272 - {
5273 - xc += outer_border->left;
5274 - yc -= outer_border->bottom;
5275 - wc = MAX (xy1_gap - xy0_gap - (outer_border->left + outer_border->right) - (border.left + border.right), 0);
5276 - hc += outer_border->bottom;
5277 - }
5278 -
5279 - if (xy0_gap < _gtk_css_number_get (&bottom_left_radius->horizontal, width))
5280 - junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;
5281 -
5282 - if (xy1_gap > width - _gtk_css_number_get (&bottom_right_radius->horizontal, width))
5283 - junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;
5284 -
5285 - break;
5286 - case GTK_POS_LEFT:
5287 - xc = x;
5288 - yc = y + xy0_gap + border.top;
5289 - wc = border.left * 2;
5290 - hc = MAX (xy1_gap - xy0_gap - (border.top + border.bottom), 0);
5291 -
5292 - if (has_outer_stroke)
5293 - {
5294 - yc += outer_border->top;
5295 - wc += outer_border->left;
5296 - hc = MAX (xy1_gap - xy0_gap - (outer_border->top + outer_border->bottom) - (border.top + border.bottom), 0);
5297 - }
5298 -
5299 - if (xy0_gap < _gtk_css_number_get (&top_left_radius->vertical, height))
5300 - junction |= GTK_JUNCTION_CORNER_TOPLEFT;
5301 -
5302 - if (xy1_gap > height - _gtk_css_number_get (&bottom_left_radius->vertical, height))
5303 - junction |= GTK_JUNCTION_CORNER_BOTTOMLEFT;
5304 -
5305 - break;
5306 - case GTK_POS_RIGHT:
5307 - xc = x + width - border.right * 2;
5308 - yc = y + xy0_gap + border.top;
5309 - wc = border.right * 2;
5310 - hc = MAX (xy1_gap - xy0_gap - (border.top + border.bottom), 0);
5311 -
5312 - if (has_outer_stroke)
5313 - {
5314 - xc -= outer_border->right;
5315 - yc += outer_border->top;
5316 - wc += outer_border->right;
5317 - hc = MAX (xy1_gap - xy0_gap - (outer_border->top + outer_border->bottom) - (border.top + border.bottom), 0);
5318 - }
5319 -
5320 - if (xy0_gap < _gtk_css_number_get (&top_right_radius->vertical, height))
5321 - junction |= GTK_JUNCTION_CORNER_TOPRIGHT;
5322 -
5323 - if (xy1_gap > height - _gtk_css_number_get (&bottom_right_radius->vertical, height))
5324 - junction |= GTK_JUNCTION_CORNER_BOTTOMRIGHT;
5325 -
5326 - break;
5327 - }
5328 -
5329 - /* clip the gap */
5330 - cairo_clip_extents (cr, &x0, &y0, &x1, &y1);
5331 - cairo_rectangle (cr, x0, y0, x1 - x0, yc - y0);
5332 - cairo_rectangle (cr, x0, yc, xc - x0, hc);
5333 - cairo_rectangle (cr, xc + wc, yc, x1 - (xc + wc), hc);
5334 - cairo_rectangle (cr, x0, yc + hc, x1 - x0, y1 - (yc + hc));
5335 - cairo_clip (cr);
5336 -
5337 - /* draw the frame, gap area will not be drawn */
5338 - unico_cairo_draw_frame (engine, cr, x, y, width, height, 0, junction);
5339 -
5340 - cairo_restore (cr);
5341 -
5342 - g_free (top_left_radius);
5343 - g_free (top_right_radius);
5344 - g_free (bottom_right_radius);
5345 - g_free (bottom_left_radius);
5346 - gtk_border_free (outer_border);
5347 -}
5348 -
5349 -static void
5350 -unico_draw_grip (DRAW_ARGS)
5351 -{
5352 - GdkRGBA border_color;
5353 - GdkRGBA *inner_stroke_color;
5354 - GtkStateFlags state;
5355 - gint lx, ly;
5356 -
5357 - if (draw_centroid_texture (engine, cr, x, y, width, height))
5358 - return;
5359 -
5360 - state = gtk_theming_engine_get_state (engine);
5361 -
5362 - gtk_theming_engine_get (engine, state,
5363 - "-unico-inner-stroke-color", &inner_stroke_color,
5364 - NULL);
5365 - gtk_theming_engine_get_border_color (engine, state, &border_color);
5366 -
5367 - for (ly = 0; ly < 4; ly++)
5368 - {
5369 - /* vertically, four rows of dots */
5370 - for (lx = 0; lx <= ly; lx++)
5371 - {
5372 - /* horizontally */
5373 - int ny = (3.5 - ly) * 3;
5374 - int nx = lx * 3;
5375 -
5376 - gdk_cairo_set_source_rgba (cr, inner_stroke_color);
5377 - cairo_rectangle (cr, x + width - nx - 1, y + height - ny - 1, 2, 2);
5378 - cairo_fill (cr);
5379 -
5380 - gdk_cairo_set_source_rgba (cr, &border_color);
5381 - cairo_rectangle (cr, x + width - nx - 1, y + height - ny - 1, 1, 1);
5382 - cairo_fill (cr);
5383 - }
5384 - }
5385 -
5386 - gdk_rgba_free (inner_stroke_color);
5387 -}
5388 -
5389 -static void
5390 -unico_draw_handle (DRAW_ARGS)
5391 -{
5392 - GtkBorder border;
5393 - GtkStateFlags state;
5394 - gdouble line_width;
5395 - gint i, bar_y, num_bars, bar_spacing, bar_width, bar_height;
5396 -
5397 - state = gtk_theming_engine_get_state (engine);
5398 - gtk_theming_engine_get_border (engine, state, &border);
5399 -
5400 - unico_cairo_draw_background (engine, cr,
5401 - x - border.left, y - border.top,
5402 - width + border.left + border.right, height + border.top + border.bottom,
5403 - 0, GTK_JUNCTION_NONE);
5404 -
5405 - if (draw_centroid_texture (engine, cr, x, y, width, height))
5406 - return;
5407 -
5408 - unico_get_line_width (engine, &line_width);
5409 -
5410 - if (line_width < 1)
5411 - return;
5412 -
5413 - bar_y = 1;
5414 - num_bars = 3;
5415 - bar_spacing = 3;
5416 - bar_width = 3;
5417 - bar_height = num_bars * bar_spacing * line_width;
5418 -
5419 - cairo_save (cr);
5420 -
5421 - cairo_translate (cr, x + (gint) (width / 2), y + (gint) (height / 2));
5422 -
5423 - if (height > width)
5424 - cairo_translate (cr, - bar_width / 2 - 0.5, - bar_height / 2 + 0.5);
5425 - else
5426 - {
5427 - cairo_translate (cr, - bar_height / 2 + 0.5, bar_width / 2 + 0.5);
5428 - cairo_rotate (cr, - G_PI / 2);
5429 - }
5430 -
5431 - for (i = 0; i < num_bars; i++)
5432 - {
5433 - /* draw bars */
5434 - cairo_move_to (cr, 0, bar_y);
5435 - cairo_line_to (cr, bar_width, bar_y);
5436 - unico_cairo_set_source_border (engine, cr, bar_width, line_width);
5437 - cairo_stroke (cr);
5438 -
5439 - cairo_move_to (cr, 0, bar_y + line_width);
5440 - cairo_line_to (cr, bar_width, bar_y + line_width);
5441 - unico_cairo_set_source_inner_stroke (engine, cr, bar_width, line_width);
5442 - cairo_stroke (cr);
5443 -
5444 - bar_y += bar_spacing;
5445 - }
5446 -
5447 - cairo_restore (cr);
5448 -}
5449 -
5450 -static void
5451 -unico_draw_line (GtkThemingEngine *engine,
5452 - cairo_t *cr,
5453 - gdouble x0,
5454 - gdouble y0,
5455 - gdouble x1,
5456 - gdouble y1)
5457 -{
5458 - /* line endings */
5459 - if (y0 == y1)
5460 - {
5461 - y0 += 0.5;
5462 - y1 += 0.5;
5463 - x0 += 0.5;
5464 - x1 -= 0.5;
5465 - }
5466 - else if (x0 == x1)
5467 - {
5468 - x0 += 0.5;
5469 - x1 += 0.5;
5470 - y0 += 0.5;
5471 - y1 -= 0.5;
5472 - }
5473 -
5474 - cairo_move_to (cr, x0, y0);
5475 - cairo_line_to (cr, x1, y1);
5476 - unico_cairo_set_source_border (engine, cr, MAX (x1 - x0, 1), MAX (y1 - y0, 1));
5477 - cairo_stroke (cr);
5478 -}
5479 -
5480 -static void
5481 -unico_draw_notebook (DRAW_ARGS,
5482 - GtkPositionType gap_side,
5483 - gdouble xy0_gap,
5484 - gdouble xy1_gap)
5485 -{
5486 - unico_cairo_draw_background (engine, cr,
5487 - x, y, width, height,
5488 - 0, gtk_theming_engine_get_junction_sides (engine));
5489 - unico_draw_frame_gap (engine, cr,
5490 - x, y, width, height,
5491 - gap_side, xy0_gap, xy1_gap);
5492 -}
5493 -
5494 -static void
5495 -unico_draw_radio (DRAW_ARGS)
5496 -{
5497 - GtkStateFlags state;
5498 - gboolean in_menu;
5499 - gboolean draw_bullet, inconsistent;
5500 -
5501 - state = gtk_theming_engine_get_state (engine);
5502 -
5503 - in_menu = gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_MENUITEM);
5504 - inconsistent = (state & GTK_STATE_FLAG_INCONSISTENT) != 0;
5505 - draw_bullet = (state & GTK_STATE_FLAG_ACTIVE) != 0;
5506 - draw_bullet |= inconsistent;
5507 -
5508 - if (!in_menu)
5509 - {
5510 - unico_cairo_draw_background (engine, cr,
5511 - x, y, width, height,
5512 - 0, gtk_theming_engine_get_junction_sides (engine));
5513 - unico_cairo_draw_frame (engine, cr,
5514 - x, y, width, height,
5515 - 0, gtk_theming_engine_get_junction_sides (engine));
5516 - }
5517 -
5518 - if (draw_bullet)
5519 - {
5520 - GdkRGBA *bullet_color;
5521 -
5522 - gtk_theming_engine_get (engine, state,
5523 - "-unico-bullet-color", &bullet_color,
5524 - NULL);
5525 -
5526 - if (inconsistent)
5527 - {
5528 - GdkRGBA *bullet_outline_color;
5529 -
5530 - gtk_theming_engine_get (engine, state,
5531 - "-unico-bullet-outline-color", &bullet_outline_color,
5532 - NULL);
5533 -
5534 - /* bullet's outline */
5535 - cairo_rectangle (cr, x + width / 2.0 - (width + height) / 4.0 + 3, y + height / 2.0 - 2,
5536 - (width + height) / 4.0 + 2, 4);
5537 -
5538 - gdk_cairo_set_source_rgba (cr, bullet_outline_color);
5539 - cairo_fill (cr);
5540 -
5541 - cairo_rectangle (cr, x + width / 2.0 - (width + height) / 4.0 + 4, y + height / 2.0 - 1,
5542 - (width + height) / 4.0, 2);
5543 -
5544 - gdk_rgba_free (bullet_outline_color);
5545 - }
5546 - else
5547 - {
5548 - if (in_menu)
5549 - cairo_arc (cr, x + width / 2.0, y + height / 2.0,
5550 - (width + height) / 4.0 - 4, 0, G_PI * 2);
5551 - else
5552 - {
5553 - GdkRGBA *bullet_outline_color;
5554 -
5555 - gtk_theming_engine_get (engine, state,
5556 - "-unico-bullet-outline-color", &bullet_outline_color,
5557 - NULL);
5558 -
5559 - /* bullet's outline */
5560 - cairo_arc (cr, x + width / 2.0, y + height / 2.0,
5561 - (width + height) / 4.0 - 4, 0, G_PI * 2);
5562 - gdk_cairo_set_source_rgba (cr, bullet_outline_color);
5563 - cairo_fill (cr);
5564 -
5565 - cairo_arc (cr, x + width / 2.0, y + height / 2.0,
5566 - (width + height) / 4.0 - 5, 0, G_PI * 2);
5567 -
5568 - gdk_rgba_free (bullet_outline_color);
5569 - }
5570 - }
5571 -
5572 - /* bullet */
5573 - gdk_cairo_set_source_rgba (cr, bullet_color);
5574 - cairo_fill (cr);
5575 -
5576 - gdk_rgba_free (bullet_color);
5577 - }
5578 -}
5579 -
5580 -static void
5581 -unico_draw_separator (DRAW_ARGS)
5582 -{
5583 - gdouble line_width;
5584 -
5585 - unico_get_line_width (engine, &line_width);
5586 -
5587 - if (line_width == 0)
5588 - return;
5589 -
5590 - /* FIXME right code should be
5591 - * if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_VERTICAL))
5592 - * but doesn't work for separator tool item. */
5593 - if (width > height)
5594 - {
5595 - cairo_move_to (cr, x, y + (gint) (height / 2) + line_width / 2);
5596 - cairo_line_to (cr, x + width, y + (gint) (height / 2) + line_width / 2);
5597 - unico_cairo_set_source_inner_stroke (engine, cr, width, line_width);
5598 - cairo_stroke (cr);
5599 -
5600 - cairo_move_to (cr, x, y + (gint) (height / 2) - line_width / 2);
5601 - cairo_line_to (cr, x + width, y + (gint) (height / 2) - line_width / 2);
5602 - unico_cairo_set_source_border (engine, cr, width, line_width);
5603 - cairo_stroke (cr);
5604 - }
5605 - else
5606 - {
5607 - cairo_move_to (cr, x + (gint) (width / 2) + line_width / 2, y);
5608 - cairo_line_to (cr, x + (gint) (width / 2) + line_width / 2, y + height);
5609 - unico_cairo_set_source_inner_stroke (engine, cr, line_width, height);
5610 - cairo_stroke (cr);
5611 -
5612 - cairo_move_to (cr, x + (gint) (width / 2) - line_width / 2, y);
5613 - cairo_line_to (cr, x + (gint) (width / 2) - line_width / 2, y + height);
5614 - unico_cairo_set_source_border (engine, cr, line_width, height);
5615 - cairo_stroke (cr);
5616 - }
5617 -}
5618 -
5619 -static void
5620 -unico_draw_slider (DRAW_ARGS,
5621 - GtkOrientation orientation)
5622 -{
5623 - /* use orientation, if needed */
5624 - unico_cairo_draw_background (engine, cr,
5625 - x, y, width, height,
5626 - 0, gtk_theming_engine_get_junction_sides (engine));
5627 -
5628 - draw_centroid_texture (engine, cr, x, y, width, height);
5629 -
5630 - unico_cairo_draw_frame (engine, cr,
5631 - x, y, width, height,
5632 - 0, gtk_theming_engine_get_junction_sides (engine));
5633 -}
5634 -
5635 -static void
5636 -unico_draw_spinbutton_background (DRAW_ARGS)
5637 -{
5638 - GtkBorder border, *outer_border;
5639 - GtkJunctionSides junction;
5640 - GtkStateFlags state;
5641 -
5642 - junction = gtk_theming_engine_get_junction_sides (engine);
5643 -
5644 - state = gtk_theming_engine_get_state (engine);
5645 -
5646 - gtk_theming_engine_get (engine, state,
5647 - "-unico-outer-stroke-width", &outer_border,
5648 - NULL);
5649 - gtk_theming_engine_get_border (engine, state, &border);
5650 -
5651 - cairo_save (cr);
5652 -
5653 - cairo_rectangle (cr, x, y, width, height);
5654 - cairo_clip (cr);
5655 -
5656 - if (!(junction & GTK_JUNCTION_CORNER_TOPRIGHT))
5657 - {
5658 - y = ceil (y);
5659 - height = floor (height);
5660 - height += border.bottom + outer_border->bottom;
5661 - }
5662 - else
5663 - {
5664 - y = floor (y);
5665 - height = ceil (height);
5666 - y -= outer_border->top;
5667 - height += outer_border->bottom;
5668 - }
5669 -
5670 - unico_cairo_draw_background (engine, cr,
5671 - x, y, width, height,
5672 - 0, junction);
5673 -
5674 - cairo_restore (cr);
5675 -
5676 - gtk_border_free (outer_border);
5677 -}
5678 -
5679 -static void
5680 -unico_draw_spinbutton_frame (DRAW_ARGS)
5681 -{
5682 - GtkBorder border, *outer_border;
5683 - GtkJunctionSides junction;
5684 - GtkStateFlags state;
5685 -
5686 - junction = gtk_theming_engine_get_junction_sides (engine);
5687 -
5688 - state = gtk_theming_engine_get_state (engine);
5689 -
5690 - gtk_theming_engine_get (engine, state,
5691 - "-unico-outer-stroke-width", &outer_border,
5692 - NULL);
5693 - gtk_theming_engine_get_border (engine, state, &border);
5694 -
5695 - cairo_save (cr);
5696 -
5697 - cairo_rectangle (cr, x, y, width, height);
5698 - cairo_clip (cr);
5699 -
5700 - if (!(junction & GTK_JUNCTION_CORNER_TOPRIGHT))
5701 - {
5702 - y = ceil (y);
5703 - height = floor (height);
5704 - height += border.bottom + outer_border->bottom;
5705 - }
5706 - else
5707 - {
5708 - y = floor (y);
5709 - height = ceil (height);
5710 - y -= outer_border->top;
5711 - height += outer_border->bottom;
5712 - }
5713 -
5714 - unico_cairo_draw_frame (engine, cr,
5715 - x, y, width, height,
5716 - 0, junction);
5717 -
5718 - cairo_restore (cr);
5719 -
5720 - gtk_border_free (outer_border);
5721 }
5723 void
5724 @@ -1046,25 +229,7 @@
5725 {
5726 g_assert (functions);
5728 - functions->draw_activity = unico_draw_activity;
5729 - functions->draw_arrow = unico_draw_arrow;
5730 - functions->draw_cell_background = unico_draw_cell_background;
5731 - functions->draw_cell_frame = unico_draw_cell_frame;
5732 - functions->draw_check = unico_draw_check;
5733 - functions->draw_common = unico_draw_common;
5734 - functions->draw_common_background = unico_draw_common_background;
5735 - functions->draw_common_frame = unico_draw_common_frame;
5736 - functions->draw_expander = unico_draw_expander;
5737 - functions->draw_extension = unico_draw_extension;
5738 - functions->draw_focus = unico_draw_focus;
5739 - functions->draw_frame_gap = unico_draw_frame_gap;
5740 - functions->draw_grip = unico_draw_grip;
5741 - functions->draw_handle = unico_draw_handle;
5742 - functions->draw_line = unico_draw_line;
5743 - functions->draw_notebook = unico_draw_notebook;
5744 - functions->draw_radio = unico_draw_radio;
5745 - functions->draw_separator = unico_draw_separator;
5746 - functions->draw_slider = unico_draw_slider;
5747 - functions->draw_spinbutton_background = unico_draw_spinbutton_background;
5748 - functions->draw_spinbutton_frame = unico_draw_spinbutton_frame;
5749 + functions->draw_arrow = unico_draw_arrow;
5750 + functions->draw_expander = unico_draw_expander;
5751 + functions->draw_focus = unico_draw_focus;
5752 }
5754 === modified file 'unico/unico-draw.h'
5755 --- unico/unico-draw.h 2011-07-27 14:35:12 +0000
5756 +++ unico/unico-draw.h 2016-01-19 12:14:18 +0000
5757 @@ -1,10 +1,9 @@
5758 /* The Unico Theming Engine for Gtk+.
5759 * Copyright (C) 2011 Canonical Ltd
5760 *
5761 - * This library is free software; you can redistribute it and/or
5762 - * modify it under the terms of the GNU Lesser General Public
5763 - * License as published by the Free Software Foundation; either
5764 - * version 2 of the License, or (at your option) any later version.
5765 + * This library is free software; you can redistribute it and/or modify
5766 + * it under the terms of the GNU Lesser General Public License
5767 + * version 2.1 as published by the Free Software Foundation.
5768 *
5769 * This library is distributed in the hope that it will be useful,
5770 * but WITHOUT ANY WARRANTY; without even the implied warranty of
5772 === modified file 'unico/unico-engine.c'
5773 --- unico/unico-engine.c 2011-07-28 09:12:33 +0000
5774 +++ unico/unico-engine.c 2016-01-19 12:14:18 +0000
5775 @@ -1,10 +1,9 @@
5776 /* The Unico Theming Engine for Gtk+.
5777 * Copyright (C) 2011 Canonical Ltd
5778 *
5779 - * This library is free software; you can redistribute it and/or
5780 - * modify it under the terms of the GNU Lesser General Public
5781 - * License as published by the Free Software Foundation; either
5782 - * version 2 of the License, or (at your option) any later version.
5783 + * This library is free software; you can redistribute it and/or modify
5784 + * it under the terms of the GNU Lesser General Public License
5785 + * version 2.1 as published by the Free Software Foundation.
5786 *
5787 * This library is distributed in the hope that it will be useful,
5788 * but WITHOUT ANY WARRANTY; without even the implied warranty of
5789 @@ -41,31 +40,6 @@
5790 G_DEFINE_DYNAMIC_TYPE (UnicoEngine, unico_engine, GTK_TYPE_THEMING_ENGINE)
5792 static void
5793 -unico_engine_render_activity (GtkThemingEngine *engine,
5794 - cairo_t *cr,
5795 - gdouble x,
5796 - gdouble y,
5797 - gdouble width,
5798 - gdouble height)
5799 -{
5800 - UnicoStyleFunctions *style_functions;
5801 - const GtkWidgetPath *path;
5802 -
5803 - UNICO_CAIRO_INIT
5804 -
5805 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
5806 - path = gtk_theming_engine_get_path (engine);
5807 -
5808 - if (gtk_widget_path_is_type (path, GTK_TYPE_SCALE))
5809 - unico_trim_scale_allocation (engine, &x, &y, &width, &height);
5810 -
5811 - if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_SPINNER))
5812 - GTK_THEMING_ENGINE_CLASS (unico_engine_parent_class)->render_activity (engine, cr, x, y, width, height);
5813 - else
5814 - style_functions->draw_activity (engine, cr, x, y, width, height);
5815 -}
5816 -
5817 -static void
5818 unico_engine_render_arrow (GtkThemingEngine *engine,
5819 cairo_t *cr,
5820 gdouble angle,
5821 @@ -83,61 +57,6 @@
5822 }
5824 static void
5825 -unico_engine_render_background (GtkThemingEngine *engine,
5826 - cairo_t *cr,
5827 - gdouble x,
5828 - gdouble y,
5829 - gdouble width,
5830 - gdouble height)
5831 -{
5832 - UnicoStyleFunctions *style_functions;
5833 - const GtkWidgetPath *path;
5834 - GtkRegionFlags flags;
5835 -
5836 - UNICO_CAIRO_INIT
5837 -
5838 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
5839 - path = gtk_theming_engine_get_path (engine);
5840 -
5841 - if (gtk_widget_path_is_type (path, GTK_TYPE_SCALE) &&
5842 - gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_TROUGH))
5843 - unico_trim_scale_allocation (engine, &x, &y, &width, &height);
5844 -
5845 - if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_BUTTON) &&
5846 - gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_SPINBUTTON))
5847 - style_functions->draw_spinbutton_background (engine, cr, x, y, width, height);
5848 - else if (!gtk_widget_path_is_type (path, GTK_TYPE_ICON_VIEW) &&
5849 - gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_VIEW) &&
5850 - gtk_theming_engine_has_region (engine, GTK_STYLE_REGION_COLUMN, &flags))
5851 - style_functions->draw_cell_background (engine, cr, x, y, width, height, flags);
5852 - else
5853 - style_functions->draw_common_background (engine, cr, x, y, width, height);
5854 -}
5855 -
5856 -static void
5857 -unico_engine_render_check (GtkThemingEngine *engine,
5858 - cairo_t *cr,
5859 - gdouble x,
5860 - gdouble y,
5861 - gdouble width,
5862 - gdouble height)
5863 -{
5864 - UnicoStyleFunctions *style_functions;
5865 -
5866 - UNICO_CAIRO_INIT
5867 -
5868 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
5869 -
5870 - if (!gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_MENUITEM))
5871 - {
5872 - if (unico_cairo_draw_from_texture (engine, cr, x, y, width, height))
5873 - return;
5874 - }
5875 -
5876 - style_functions->draw_check (engine, cr, x, y, width, height);
5877 -}
5878 -
5879 -static void
5880 unico_engine_render_expander (GtkThemingEngine *engine,
5881 cairo_t *cr,
5882 gdouble x,
5883 @@ -155,24 +74,6 @@
5884 }
5886 static void
5887 -unico_engine_render_extension (GtkThemingEngine *engine,
5888 - cairo_t *cr,
5889 - gdouble x,
5890 - gdouble y,
5891 - gdouble width,
5892 - gdouble height,
5893 - GtkPositionType gap_side)
5894 -{
5895 - UnicoStyleFunctions *style_functions;
5896 -
5897 - UNICO_CAIRO_INIT
5898 -
5899 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
5900 -
5901 - style_functions->draw_extension (engine, cr, x, y, width, height, gap_side);
5902 -}
5903 -
5904 -static void
5905 unico_engine_render_focus (GtkThemingEngine *engine,
5906 cairo_t *cr,
5907 gdouble x,
5908 @@ -189,147 +90,6 @@
5909 style_functions->draw_focus (engine, cr, x, y, width, height);
5910 }
5912 -static void
5913 -unico_engine_render_frame (GtkThemingEngine *engine,
5914 - cairo_t *cr,
5915 - gdouble x,
5916 - gdouble y,
5917 - gdouble width,
5918 - gdouble height)
5919 -{
5920 - UnicoStyleFunctions *style_functions;
5921 - const GtkWidgetPath *path;
5922 - GtkRegionFlags flags;
5923 -
5924 - UNICO_CAIRO_INIT
5925 -
5926 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
5927 - path = gtk_theming_engine_get_path (engine);
5928 -
5929 - if (gtk_widget_path_is_type (path, GTK_TYPE_SCALE) &&
5930 - gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_TROUGH))
5931 - unico_trim_scale_allocation (engine, &x, &y, &width, &height);
5932 -
5933 - if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_SEPARATOR))
5934 - style_functions->draw_separator (engine, cr, x, y, width, height);
5935 - else if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_BUTTON) &&
5936 - gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_SPINBUTTON))
5937 - style_functions->draw_spinbutton_frame (engine, cr, x, y, width, height);
5938 - else if (!gtk_widget_path_is_type (path, GTK_TYPE_ICON_VIEW) &&
5939 - gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_VIEW) &&
5940 - gtk_theming_engine_has_region (engine, GTK_STYLE_REGION_COLUMN, &flags))
5941 - style_functions->draw_cell_frame (engine, cr, x, y, width, height, flags);
5942 - else
5943 - style_functions->draw_common_frame (engine, cr, x, y, width, height);
5944 -}
5945 -
5946 -static void
5947 -unico_engine_render_frame_gap (GtkThemingEngine *engine,
5948 - cairo_t *cr,
5949 - gdouble x,
5950 - gdouble y,
5951 - gdouble width,
5952 - gdouble height,
5953 - GtkPositionType gap_side,
5954 - gdouble xy0_gap,
5955 - gdouble xy1_gap)
5956 -{
5957 - UnicoStyleFunctions *style_functions;
5958 -
5959 - UNICO_CAIRO_INIT
5960 -
5961 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
5962 -
5963 - if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_NOTEBOOK))
5964 - style_functions->draw_notebook (engine, cr, x, y, width, height, gap_side, xy0_gap, xy1_gap);
5965 - else
5966 - style_functions->draw_frame_gap (engine, cr, x, y, width, height, gap_side, xy0_gap, xy1_gap);
5967 -}
5968 -
5969 -static void
5970 -unico_engine_render_handle (GtkThemingEngine *engine,
5971 - cairo_t *cr,
5972 - gdouble x,
5973 - gdouble y,
5974 - gdouble width,
5975 - gdouble height)
5976 -{
5977 - UnicoStyleFunctions *style_functions;
5978 -
5979 - UNICO_CAIRO_INIT
5980 -
5981 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
5982 -
5983 - if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_GRIP))
5984 - style_functions->draw_grip (engine, cr, x, y, width, height);
5985 - else
5986 - style_functions->draw_handle (engine, cr, x, y, width, height);
5987 -}
5988 -
5989 -static void
5990 -unico_engine_render_line (GtkThemingEngine *engine,
5991 - cairo_t *cr,
5992 - gdouble x0,
5993 - gdouble y0,
5994 - gdouble x1,
5995 - gdouble y1)
5996 -{
5997 - UnicoStyleFunctions *style_functions;
5998 -
5999 - UNICO_CAIRO_INIT
6000 -
6001 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
6002 -
6003 - style_functions->draw_line (engine, cr, x0, y0, x1, y1);
6004 -}
6005 -
6006 -static void
6007 -unico_engine_render_option (GtkThemingEngine *engine,
6008 - cairo_t *cr,
6009 - gdouble x,
6010 - gdouble y,
6011 - gdouble width,
6012 - gdouble height)
6013 -{
6014 - UnicoStyleFunctions *style_functions;
6015 -
6016 - UNICO_CAIRO_INIT
6017 -
6018 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
6019 -
6020 - if (!gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_MENUITEM))
6021 - {
6022 - if (unico_cairo_draw_from_texture (engine, cr, x, y, width, height))
6023 - return;
6024 - }
6025 -
6026 - style_functions->draw_radio (engine, cr, x, y, width, height);
6027 -}
6028 -
6029 -static void
6030 -unico_engine_render_slider (GtkThemingEngine *engine,
6031 - cairo_t *cr,
6032 - gdouble x,
6033 - gdouble y,
6034 - gdouble width,
6035 - gdouble height,
6036 - GtkOrientation orientation)
6037 -{
6038 - UnicoStyleFunctions *style_functions;
6039 -
6040 - UNICO_CAIRO_INIT
6041 -
6042 - unico_lookup_functions (UNICO_ENGINE (engine), &style_functions);
6043 -
6044 - if (gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_SCALE))
6045 - {
6046 - if (unico_cairo_draw_from_texture (engine, cr, x, y, width, height))
6047 - return;
6048 - }
6049 -
6050 - style_functions->draw_slider (engine, cr, x, y, width, height, orientation);
6051 -}
6052 -
6053 void
6054 unico_engine_register_types (GTypeModule *module)
6055 {
6056 @@ -347,176 +107,15 @@
6057 {
6058 GtkThemingEngineClass *engine_class = GTK_THEMING_ENGINE_CLASS (klass);
6060 - engine_class->render_activity = unico_engine_render_activity;
6061 engine_class->render_arrow = unico_engine_render_arrow;
6062 - engine_class->render_background = unico_engine_render_background;
6063 - engine_class->render_check = unico_engine_render_check;
6064 engine_class->render_expander = unico_engine_render_expander;
6065 - engine_class->render_extension = unico_engine_render_extension;
6066 engine_class->render_focus = unico_engine_render_focus;
6067 - engine_class->render_frame = unico_engine_render_frame;
6068 - engine_class->render_frame_gap = unico_engine_render_frame_gap;
6069 - engine_class->render_handle = unico_engine_render_handle;
6070 - engine_class->render_line = unico_engine_render_line;
6071 - engine_class->render_option = unico_engine_render_option;
6072 - engine_class->render_slider = unico_engine_render_slider;
6073 -
6074 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6075 - g_param_spec_boxed ("background-texture",
6076 - "Background texture",
6077 - "Background texture",
6078 - CAIRO_GOBJECT_TYPE_PATTERN, 0));
6079 -
6080 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6081 - g_param_spec_boxed ("border-gradient",
6082 - "Border gradient",
6083 - "Border gradient",
6084 - CAIRO_GOBJECT_TYPE_PATTERN, 0));
6085 -
6086 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6087 - g_param_spec_boxed ("bullet-color",
6088 - "Bullet color",
6089 - "Bullet color",
6090 - GDK_TYPE_RGBA, 0));
6091 -
6092 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6093 - g_param_spec_boxed ("bullet-outline-color",
6094 - "Bullet outline color",
6095 - "Bullet outline color",
6096 - GDK_TYPE_RGBA, 0));
6097 -
6098 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6099 - g_param_spec_boxed ("centroid-texture",
6100 - "Centroid texture",
6101 - "Centroid texture",
6102 - CAIRO_GOBJECT_TYPE_PATTERN, 0));
6103 -
6104 -
6105 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6106 - g_param_spec_boxed ("focus-border-color",
6107 - "Focus border color",
6108 - "Focus border color",
6109 - GDK_TYPE_RGBA, 0));
6110 -
6111 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6112 - g_param_spec_int ("focus-border-radius",
6113 - "Focus border radius",
6114 - "Focus border radius",
6115 - 0, G_MAXINT, 0, 0));
6116 -
6117 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6118 - g_param_spec_boxed ("focus-fill-color",
6119 - "Focus fill color",
6120 - "Focus fill color",
6121 - GDK_TYPE_RGBA, 0));
6122 -
6123 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6124 - g_param_spec_boxed ("focus-outer-stroke-color",
6125 - "Focus outer stroke color",
6126 - "Focus outer stroke color",
6127 - GDK_TYPE_RGBA, 0));
6128 -
6129 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6130 - g_param_spec_int ("glow-radius",
6131 - "Glow radius",
6132 - "Glow radius",
6133 - 0, G_MAXINT, 0, 0));
6134 -
6135 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6136 - g_param_spec_boxed ("glow-color",
6137 - "Glow color",
6138 - "Glow color",
6139 - GDK_TYPE_RGBA, 0));
6140 -
6141 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6142 - g_param_spec_boxed ("inner-stroke-color",
6143 - "Inner stroke color",
6144 - "Inner stroke color",
6145 - GDK_TYPE_RGBA, 0));
6146 -
6147 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6148 - g_param_spec_boxed ("inner-stroke-top-color",
6149 - "Inner stroke top color",
6150 - "Inner stroke top color",
6151 - GDK_TYPE_RGBA, 0));
6152 -
6153 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6154 - g_param_spec_boxed ("inner-stroke-right-color",
6155 - "Inner stroke right color",
6156 - "Inner stroke right color",
6157 - GDK_TYPE_RGBA, 0));
6158 -
6159 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6160 - g_param_spec_boxed ("inner-stroke-bottom-color",
6161 - "Inner stroke bottom color",
6162 - "Inner stroke bottom color",
6163 - GDK_TYPE_RGBA, 0));
6164 -
6165 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6166 - g_param_spec_boxed ("inner-stroke-left-color",
6167 - "Inner stroke left color",
6168 - "Inner stroke left color",
6169 - GDK_TYPE_RGBA, 0));
6170 -
6171 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6172 - g_param_spec_boxed ("inner-stroke-gradient",
6173 - "Inner stroke gradient",
6174 - "Inner stroke gradient",
6175 - CAIRO_GOBJECT_TYPE_PATTERN, 0));
6176 -
6177 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6178 - g_param_spec_boxed ("inner-stroke-width",
6179 - "Inner stroke width",
6180 - "Inner stroke width",
6181 - GTK_TYPE_BORDER, 0));
6182 -
6183 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6184 - g_param_spec_boxed ("outer-stroke-color",
6185 - "Outer stroke color",
6186 - "Outer stroke color",
6187 - GDK_TYPE_RGBA, 0));
6188 -
6189 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6190 - g_param_spec_boxed ("outer-stroke-top-color",
6191 - "Outer stroke top color",
6192 - "Outer stroke top color",
6193 - GDK_TYPE_RGBA, 0));
6194 -
6195 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6196 - g_param_spec_boxed ("outer-stroke-right-color",
6197 - "Outer stroke right color",
6198 - "Outer stroke right color",
6199 - GDK_TYPE_RGBA, 0));
6200 -
6201 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6202 - g_param_spec_boxed ("outer-stroke-bottom-color",
6203 - "Outer stroke bottom color",
6204 - "Outer stroke bottom color",
6205 - GDK_TYPE_RGBA, 0));
6206 -
6207 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6208 - g_param_spec_boxed ("outer-stroke-left-color",
6209 - "Outer stroke left color",
6210 - "Outer stroke left color",
6211 - GDK_TYPE_RGBA, 0));
6212 -
6213 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6214 - g_param_spec_boxed ("outer-stroke-gradient",
6215 - "Outer stroke gradient",
6216 - "Outer stroke gradient",
6217 - CAIRO_GOBJECT_TYPE_PATTERN, 0));
6218 -
6219 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6220 - g_param_spec_boxed ("outer-stroke-width",
6221 - "Outer stroke width",
6222 - "Outer stroke width",
6223 - GTK_TYPE_BORDER, 0));
6224 -
6225 - gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6226 - g_param_spec_boxed ("text-shadow-color",
6227 - "Text shadow color",
6228 - "Text shadow color",
6229 - GDK_TYPE_RGBA, 0));
6230 +
6231 + gtk_theming_engine_register_property (UNICO_NAMESPACE, NULL,
6232 + g_param_spec_boxed ("arrow-texture",
6233 + "Arrow texture",
6234 + "Arrow texture",
6235 + CAIRO_GOBJECT_TYPE_PATTERN, 0));
6236 }
6238 static void
6240 === modified file 'unico/unico-engine.h'
6241 --- unico/unico-engine.h 2011-08-09 22:18:56 +0000
6242 +++ unico/unico-engine.h 2016-01-19 12:14:18 +0000
6243 @@ -1,10 +1,9 @@
6244 /* The Unico Theming Engine for Gtk+.
6245 * Copyright (C) 2011 Canonical Ltd
6246 *
6247 - * This library is free software; you can redistribute it and/or
6248 - * modify it under the terms of the GNU Lesser General Public
6249 - * License as published by the Free Software Foundation; either
6250 - * version 2 of the License, or (at your option) any later version.
6251 + * This library is free software; you can redistribute it and/or modify
6252 + * it under the terms of the GNU Lesser General Public License
6253 + * version 2.1 as published by the Free Software Foundation.
6254 *
6255 * This library is distributed in the hope that it will be useful,
6256 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6258 === modified file 'unico/unico-support.c'
6259 --- unico/unico-support.c 2011-08-09 21:27:07 +0000
6260 +++ unico/unico-support.c 2016-01-19 12:14:18 +0000
6261 @@ -1,10 +1,9 @@
6262 /* The Unico Theming Engine for Gtk+.
6263 * Copyright (C) 2011 Canonical Ltd
6264 *
6265 - * This library is free software; you can redistribute it and/or
6266 - * modify it under the terms of the GNU Lesser General Public
6267 - * License as published by the Free Software Foundation; either
6268 - * version 2 of the License, or (at your option) any later version.
6269 + * This library is free software; you can redistribute it and/or modify
6270 + * it under the terms of the GNU Lesser General Public License
6271 + * version 2.1 as published by the Free Software Foundation.
6272 *
6273 * This library is distributed in the hope that it will be useful,
6274 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6275 @@ -26,38 +25,6 @@
6276 #include "unico-support.h"
6277 #include "unico-types.h"
6279 -gboolean
6280 -unico_gdk_rgba_is_default (GdkRGBA *color)
6281 -{
6282 - GdkRGBA default_color;
6283 -
6284 - /* pink is default GdkRGBA color set in gtk/gtkstyleproperty.c */
6285 - gdk_rgba_parse (&default_color, "pink");
6286 -
6287 - return gdk_rgba_equal (&default_color, color);
6288 -}
6289 -
6290 -void
6291 -unico_get_line_width (GtkThemingEngine *engine,
6292 - gdouble *line_width)
6293 -{
6294 - GtkBorder border;
6295 - GtkStateFlags state;
6296 -
6297 - state = gtk_theming_engine_get_state (engine);
6298 -
6299 - gtk_theming_engine_get_border (engine, state, &border);
6300 -
6301 - *line_width = MIN (MIN (border.top, border.bottom),
6302 - MIN (border.left, border.right));
6303 -}
6304 -
6305 -gboolean
6306 -unico_gtk_border_is_zero (GtkBorder *border)
6307 -{
6308 - return (border->top == 0) && (border->bottom == 0) && (border->left == 0) && (border->right == 0);
6309 -}
6310 -
6311 void
6312 unico_lookup_functions (UnicoEngine *engine,
6313 UnicoStyleFunctions **functions)
6314 @@ -68,22 +35,3 @@
6315 if (functions)
6316 *functions = &engine->style_functions[UNICO_STYLE_DEFAULT];
6317 }
6318 -
6319 -void
6320 -unico_trim_scale_allocation (GtkThemingEngine *engine,
6321 - gdouble *x,
6322 - gdouble *y,
6323 - gdouble *width,
6324 - gdouble *height)
6325 -{
6326 - if (!gtk_theming_engine_has_class (engine, GTK_STYLE_CLASS_VERTICAL))
6327 - {
6328 - *y += (gint) (*height / 2.0) - 2.0;
6329 - *height = 5;
6330 - }
6331 - else
6332 - {
6333 - *x += (gint) (*width / 2.0) - 2.0;
6334 - *width = 5;
6335 - }
6336 -}
6338 === modified file 'unico/unico-support.h'
6339 --- unico/unico-support.h 2011-08-09 21:27:07 +0000
6340 +++ unico/unico-support.h 2016-01-19 12:14:18 +0000
6341 @@ -1,10 +1,9 @@
6342 /* The Unico Theming Engine for Gtk+.
6343 * Copyright (C) 2011 Canonical Ltd
6344 *
6345 - * This library is free software; you can redistribute it and/or
6346 - * modify it under the terms of the GNU Lesser General Public
6347 - * License as published by the Free Software Foundation; either
6348 - * version 2 of the License, or (at your option) any later version.
6349 + * This library is free software; you can redistribute it and/or modify
6350 + * it under the terms of the GNU Lesser General Public License
6351 + * version 2.1 as published by the Free Software Foundation.
6352 *
6353 * This library is distributed in the hope that it will be useful,
6354 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6355 @@ -30,22 +29,9 @@
6357 G_BEGIN_DECLS
6359 -G_GNUC_INTERNAL gboolean unico_gdk_rgba_is_default (GdkRGBA *color);
6360 -
6361 -G_GNUC_INTERNAL void unico_get_line_width (GtkThemingEngine *engine,
6362 - gdouble *line_width);
6363 -
6364 -G_GNUC_INTERNAL gboolean unico_gtk_border_is_zero (GtkBorder *border);
6365 -
6366 G_GNUC_INTERNAL void unico_lookup_functions (UnicoEngine *engine,
6367 UnicoStyleFunctions **functions);
6369 -G_GNUC_INTERNAL void unico_trim_scale_allocation (GtkThemingEngine *engine,
6370 - gdouble *x,
6371 - gdouble *y,
6372 - gdouble *width,
6373 - gdouble *height);
6374 -
6375 G_END_DECLS
6377 #endif /* UNICO_SUPPORT_H */
6379 === modified file 'unico/unico-theme.c'
6380 --- unico/unico-theme.c 2011-06-22 14:49:06 +0000
6381 +++ unico/unico-theme.c 2016-01-19 12:14:18 +0000
6382 @@ -1,10 +1,9 @@
6383 /* The Unico Theming Engine for Gtk+.
6384 * Copyright (C) 2011 Canonical Ltd
6385 *
6386 - * This library is free software; you can redistribute it and/or
6387 - * modify it under the terms of the GNU Lesser General Public
6388 - * License as published by the Free Software Foundation; either
6389 - * version 2 of the License, or (at your option) any later version.
6390 + * This library is free software; you can redistribute it and/or modify
6391 + * it under the terms of the GNU Lesser General Public License
6392 + * version 2.1 as published by the Free Software Foundation.
6393 *
6394 * This library is distributed in the hope that it will be useful,
6395 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6397 === modified file 'unico/unico-types.h'
6398 --- unico/unico-types.h 2012-02-08 12:54:39 +0000
6399 +++ unico/unico-types.h 2016-01-19 12:14:18 +0000
6400 @@ -1,10 +1,9 @@
6401 /* The Unico Theming Engine for Gtk+.
6402 * Copyright (C) 2011 Canonical Ltd
6403 *
6404 - * This library is free software; you can redistribute it and/or
6405 - * modify it under the terms of the GNU Lesser General Public
6406 - * License as published by the Free Software Foundation; either
6407 - * version 2 of the License, or (at your option) any later version.
6408 + * This library is free software; you can redistribute it and/or modify
6409 + * it under the terms of the GNU Lesser General Public License
6410 + * version 2.1 as published by the Free Software Foundation.
6411 *
6412 * This library is distributed in the hope that it will be useful,
6413 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6414 @@ -32,63 +31,6 @@
6416 G_BEGIN_DECLS
6418 -/* for the order in arrays */
6419 -typedef enum /*< skip >*/ {
6420 - GTK_CSS_TOP,
6421 - GTK_CSS_RIGHT,
6422 - GTK_CSS_BOTTOM,
6423 - GTK_CSS_LEFT
6424 -} GtkCssSide;
6425 -
6426 -typedef enum /*< skip >*/ {
6427 - GTK_CSS_TOP_LEFT,
6428 - GTK_CSS_TOP_RIGHT,
6429 - GTK_CSS_BOTTOM_RIGHT,
6430 - GTK_CSS_BOTTOM_LEFT
6431 -} GtkCssCorner;
6432 -
6433 -typedef enum /*< skip >*/ {
6434 - /* CSS term: <number> */
6435 - GTK_CSS_NUMBER,
6436 - /* CSS term: <percentage> */
6437 - GTK_CSS_PERCENT,
6438 - /* CSS term: <length> */
6439 - GTK_CSS_PX,
6440 - GTK_CSS_PT,
6441 - GTK_CSS_EM,
6442 - GTK_CSS_EX,
6443 - GTK_CSS_PC,
6444 - GTK_CSS_IN,
6445 - GTK_CSS_CM,
6446 - GTK_CSS_MM,
6447 - /* CSS term: <angle> */
6448 - GTK_CSS_RAD,
6449 - GTK_CSS_DEG,
6450 - GTK_CSS_GRAD,
6451 - GTK_CSS_TURN
6452 -} GtkCssUnit;
6453 -
6454 -typedef struct _GtkCssNumber GtkCssNumber;
6455 -typedef struct _GtkCssBorderCornerRadius GtkCssBorderCornerRadius;
6456 -typedef struct _GtkCssBorderRadius GtkCssBorderRadius;
6457 -
6458 -struct _GtkCssNumber {
6459 - gdouble value;
6460 - GtkCssUnit unit;
6461 -};
6462 -
6463 -struct _GtkCssBorderCornerRadius {
6464 - GtkCssNumber horizontal;
6465 - GtkCssNumber vertical;
6466 -};
6467 -
6468 -struct _GtkCssBorderRadius {
6469 - GtkCssBorderCornerRadius top_left;
6470 - GtkCssBorderCornerRadius top_right;
6471 - GtkCssBorderCornerRadius bottom_right;
6472 - GtkCssBorderCornerRadius bottom_left;
6473 -};
6474 -
6475 enum {
6476 SIDE_LEFT = 1,
6477 SIDE_BOTTOM = 1 << 1,
6478 @@ -107,8 +49,6 @@
6480 struct _UnicoStyleFunctions
6481 {
6482 - void (*draw_activity) (DRAW_ARGS);
6483 -
6484 void (*draw_arrow) (GtkThemingEngine *engine,
6485 cairo_t *cr,
6486 gdouble angle,
6487 @@ -116,58 +56,9 @@
6488 gdouble y,
6489 gdouble size);
6491 - void (*draw_cell_background) (DRAW_ARGS,
6492 - GtkRegionFlags flags);
6493 -
6494 - void (*draw_cell_frame) (DRAW_ARGS,
6495 - GtkRegionFlags flags);
6496 -
6497 - void (*draw_check) (DRAW_ARGS);
6498 -
6499 - void (*draw_common) (DRAW_ARGS);
6500 -
6501 - void (*draw_common_background) (DRAW_ARGS);
6502 -
6503 - void (*draw_common_frame) (DRAW_ARGS);
6504 -
6505 void (*draw_expander) (DRAW_ARGS);
6507 - void (*draw_extension) (DRAW_ARGS,
6508 - GtkPositionType gap_side);
6509 -
6510 void (*draw_focus) (DRAW_ARGS);
6511 -
6512 - void (*draw_frame_gap) (DRAW_ARGS,
6513 - GtkPositionType gap_side,
6514 - gdouble xy0_gap,
6515 - gdouble xy1_gap);
6516 -
6517 - void (*draw_grip) (DRAW_ARGS);
6518 -
6519 - void (*draw_handle) (DRAW_ARGS);
6520 -
6521 - void (*draw_line) (GtkThemingEngine *engine,
6522 - cairo_t *cr,
6523 - gdouble x0,
6524 - gdouble y0,
6525 - gdouble x1,
6526 - gdouble y1);
6527 -
6528 - void (*draw_notebook) (DRAW_ARGS,
6529 - GtkPositionType gap_side,
6530 - gdouble xy0_gap,
6531 - gdouble xy1_gap);
6532 -
6533 - void (*draw_radio) (DRAW_ARGS);
6534 -
6535 - void (*draw_separator) (DRAW_ARGS);
6536 -
6537 - void (*draw_slider) (DRAW_ARGS,
6538 - GtkOrientation orientation);
6539 -
6540 - void (*draw_spinbutton_background) (DRAW_ARGS);
6541 -
6542 - void (*draw_spinbutton_frame) (DRAW_ARGS);
6543 };
6545 G_END_DECLS
6547 === modified file 'unico/unico.h'
6548 --- unico/unico.h 2011-01-12 16:25:15 +0000
6549 +++ unico/unico.h 2016-01-19 12:14:18 +0000
6550 @@ -1,10 +1,9 @@
6551 /* The Unico Theming Engine for Gtk+.
6552 * Copyright (C) 2011 Canonical Ltd
6553 *
6554 - * This library is free software; you can redistribute it and/or
6555 - * modify it under the terms of the GNU Lesser General Public
6556 - * License as published by the Free Software Foundation; either
6557 - * version 2 of the License, or (at your option) any later version.
6558 + * This library is free software; you can redistribute it and/or modify
6559 + * it under the terms of the GNU Lesser General Public License
6560 + * version 2.1 as published by the Free Software Foundation.
6561 *
6562 * This library is distributed in the hope that it will be useful,
6563 * but WITHOUT ANY WARRANTY; without even the implied warranty of