Hello community, here is the log from the commit of package qtcurve-gtk2 checked in at Fri Mar 16 14:13:53 CET 2007. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-03-12 08:41:18.000000000 +0100 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2007-03-16 11:47:19.000000000 +0100 @@ -1,0 +2,18 @@ +Fri Mar 16 11:46:49 CET 2007 - stbinner@suse.de + +- update to 0.48: + 1. Fix coloured mouse over for glass styles. + 2. Re-introduce the following options: + Roundedness + List view lines + Striped progress bars + Drawing of statusbar frames + 3. Draw light border around progressbar elements + when not in flat/raised/inverted mode. + 4. Oval shaped sliders when fully round, otherwise rectangular + 5. Proper ythickness settings for frames. + 6. By default do not alter user's userChrome.css file. This now + has to be explicitly enabled via --enable-mozilla-mods + ./configure option. + +------------------------------------------------------------------- Old: ---- QtCurve-Gtk2-0.47.tar.gz New: ---- QtCurve-Gtk2-0.48.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.X20995/_old 2007-03-16 14:10:20.000000000 +0100 +++ /var/tmp/diff_new_pack.X20995/_new 2007-03-16 14:10:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 0.47) +# spec file for package qtcurve-gtk2 (Version 0.48) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -16,7 +16,7 @@ License: GNU General Public License (GPL) Group: System/GUI/KDE Summary: QtCurve style for KDE -Version: 0.47 +Version: 0.48 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: QtCurve-Gtk2-%{version}.tar.gz @@ -74,6 +74,21 @@ %pref/share/themes/QtCurve %changelog +* Fri Mar 16 2007 - stbinner@suse.de +- update to 0.48: + 1. Fix coloured mouse over for glass styles. + 2. Re-introduce the following options: + Roundedness + List view lines + Striped progress bars + Drawing of statusbar frames + 3. Draw light border around progressbar elements + when not in flat/raised/inverted mode. + 4. Oval shaped sliders when fully round, otherwise rectangular + 5. Proper ythickness settings for frames. + 6. By default do not alter user's userChrome.css file. This now + has to be explicitly enabled via --enable-mozilla-mods + ./configure option. * Mon Mar 12 2007 - stbinner@suse.de - update to 0.47: * 1. Always draw light border around glass elements. ++++++ QtCurve-Gtk2-0.47.tar.gz -> QtCurve-Gtk2-0.48.tar.gz ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/ChangeLog new/QtCurve-Gtk2-0.48/ChangeLog --- old/QtCurve-Gtk2-0.47/ChangeLog 2007-03-06 23:18:50.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/ChangeLog 2007-03-14 21:06:39.000000000 +0100 @@ -1,3 +1,19 @@ +0.48 +---- +1. Fix coloured mouse over for glass styles. +2. Re-introduce the following options: + Roundedness + List view lines + Striped progress bars + Drawing of statusbar frames +3. Draw light border around progressbar elements + when not in flat/raised/inverted mode. +4. Oval shaped sliders when fully round, otherwise rectangular +5. Proper ythickness settings for frames. +6. By default do not alter user's userChrome.css file. This now + has to be explicitly enabled via --enable-mozilla-mods + ./configure option. + 0.47 ---- 1. Always draw light border around glass elements. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/configure new/QtCurve-Gtk2-0.48/configure --- old/QtCurve-Gtk2-0.47/configure 2007-03-06 23:19:13.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/configure 2007-03-14 21:17:10.000000000 +0100 @@ -1456,7 +1456,7 @@ --disable-gtk-icons Don't build KDE to GTK icon mapping --enable-kde-event-filter Enable receiving of KDE style change events - --disable-mozilla-mods Disable mods to userChrome.css + --enable-mozilla-mods Enable mods to userChrome.css --enable-mozilla-userjs Enable mods to user.js Optional Packages: @@ -1902,7 +1902,7 @@ PACKAGE=QtCurve-Gtk2 -VERSION=0.47 +VERSION=0.48 AUTOMAKE_OPTIONS=no-dependencies am__api_version="1.9" @@ -19131,7 +19131,7 @@ if test "${enable_mozilla_mods+set}" = set; then enableval=$enable_mozilla_mods; MOZ_MODS="$enableval" else - MOZ_MODS="yes" + MOZ_MODS="no" fi if test "$MOZ_MODS" = "yes"; then diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/configure.in new/QtCurve-Gtk2-0.48/configure.in --- old/QtCurve-Gtk2-0.47/configure.in 2007-03-06 23:18:50.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/configure.in 2007-03-14 21:06:39.000000000 +0100 @@ -1,6 +1,6 @@ AC_INIT(README) PACKAGE=QtCurve-Gtk2 -VERSION=0.47 +VERSION=0.48 AC_SUBST(VERSION) AUTOMAKE_OPTIONS=no-dependencies AM_INIT_AUTOMAKE($PACKAGE, $VERSION) @@ -66,9 +66,9 @@ fi AC_ARG_ENABLE(mozilla-mods, - AS_HELP_STRING([--disable-mozilla-mods], - [Disable mods to userChrome.css]), - [MOZ_MODS="$enableval"], [MOZ_MODS="yes"]) + AS_HELP_STRING([--enable-mozilla-mods], + [Enable mods to userChrome.css]), + [MOZ_MODS="$enableval"], [MOZ_MODS="no"]) if test "$MOZ_MODS" = "yes"; then AC_DEFINE(QTC_MODIFY_MOZILLA, 1, [Defines if you want QtCurve to modify users userChrome.css]) fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/gtk2/common.h new/QtCurve-Gtk2-0.48/gtk2/common.h --- old/QtCurve-Gtk2-0.47/gtk2/common.h 2007-03-06 23:18:35.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/gtk2/common.h 2007-03-13 23:50:50.000000000 +0100 @@ -98,6 +98,8 @@ #define TAB_APPEARANCE(A) (A) /* (APPEARANCE_GLASS==(A) ? APPEARANCE_GRADIENT : (A)) */ +#define QTC_ROUNDED (ROUND_NONE!=opts.round) + #define QTC_ETCHED_DARK 0.95 #define SHADE_BEVEL_GRAD_LIGHT 1.05 #define SHADE_BEVEL_GRAD_DARK 0.93 @@ -169,6 +171,11 @@ #endif #define COLORED_BORDER_SIZE 3 #define PROGRESS_CHUNK_WIDTH 10 +#define QTC_DRAW_LIGHT_BORDER(sunken, widget) \ + ((!sunken && IS_GLASS(opts.appearance) && WIDGET_MENU_ITEM!=widget) || \ + (WIDGET_PROGRESSBAR==widget && APPEARANCE_FLAT!=opts.appearance && \ + APPEARANCE_RAISED!=opts.appearance && APPEARANCE_INVERTED!=opts.appearance)) + #define PROGRESS_ANIMATION 100 #define MIN_SLIDER_SIZE(A) (LINE_DOTS==A ? 24 : 20) @@ -180,7 +187,11 @@ PIX_RADIO_BORDER, PIX_RADIO_LIGHT, PIX_RADIO_ON, - PIX_CHECK + PIX_CHECK, + PIX_SLIDER, + PIX_SLIDER_LIGHT, + PIX_SLIDER_V, + PIX_SLIDER_LIGHT_V } EPixmap; typedef enum @@ -304,6 +315,13 @@ typedef enum { + ROUND_NONE, + ROUND_SLIGHT, + ROUND_FULL +} ERound; + +typedef enum +{ SCROLLBAR_KDE, SCROLLBAR_WINDOWS, SCROLLBAR_PLATINUM, @@ -394,9 +412,11 @@ { int contrast; double highlightFactor; + ERound round; bool embolden, lighterPopupMenuBgnd, highlightTab, + stripedProgress, animatedProgress, fixParentlessDialogs, customMenuTextColor, @@ -405,7 +425,9 @@ shadeMenubarOnlyWhenActive, thinnerMenuItems, shadowButtons, - stdFocus; + stdFocus, + lvLines, + drawStatusBarFrames; ETBarBorder toolbarBorders; EDefBtnIndicator defBtnIndicator; ELine sliderThumbs, diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/gtk2/config_file.c new/QtCurve-Gtk2-0.48/gtk2/config_file.c --- old/QtCurve-Gtk2-0.47/gtk2/config_file.c 2007-03-06 23:18:35.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/gtk2/config_file.c 2007-03-09 00:40:06.000000000 +0100 @@ -145,6 +145,22 @@ return def; } +/* Prior to 0.42 round was a bool - so need to read 'false' as 'none' */ +static ERound toRound(const char *str, ERound def) +{ + if(str) + { + if(0==memcmp(str, "none", 4) || 0==memcmp(str, "false", 5)) + return ROUND_NONE; + if(0==memcmp(str, "slight", 6)) + return ROUND_SLIGHT; + if(0==memcmp(str, "full", 4)) + return ROUND_FULL; + } + + return def; +} + static EScrollbar toScrollbar(const char *str, EScrollbar def) { if(str) @@ -434,6 +450,9 @@ #define QTC_CFG_READ_BOOL(ENTRY) \ opts->ENTRY=readBoolEntry(cfg, #ENTRY, def->ENTRY); +#define QTC_CFG_READ_ROUND(ENTRY) \ + opts->ENTRY=toRound(QTC_LATIN1(readStringEntry(cfg, #ENTRY)), def->ENTRY); + #define QTC_CFG_READ_DI(ENTRY) \ opts->ENTRY=((double)(readNumEntry(cfg, #ENTRY, ((int)(def->ENTRY*100))-100)+100))/100.0; @@ -501,10 +520,12 @@ if(cfg) { #endif + QTC_CFG_READ_ROUND(round) QTC_CFG_READ_DI(highlightFactor) QTC_CFG_READ_TB_BORDER(toolbarBorders) QTC_CFG_READ_APPEARANCE(appearance) QTC_CFG_READ_BOOL(fixParentlessDialogs) + QTC_CFG_READ_BOOL(stripedProgress) QTC_CFG_READ_BOOL(animatedProgress) QTC_CFG_READ_BOOL(lighterPopupMenuBgnd) QTC_CFG_READ_BOOL(embolden) @@ -530,6 +551,8 @@ QTC_CFG_READ_SCROLLBAR(scrollbarType) QTC_CFG_READ_BOOL(shadowButtons) QTC_CFG_READ_BOOL(stdFocus) + QTC_CFG_READ_BOOL(lvLines) + QTC_CFG_READ_BOOL(drawStatusBarFrames) #ifndef __cplusplus releaseConfig(cfg); @@ -546,6 +569,9 @@ opts->highlightFactor>((100.0+MAX_HIGHLIGHT_FACTOR)/100.0)) opts->highlightFactor=DEFAULT_HIGHLIGHT_FACTOR; + if(opts->animatedProgress && !opts->stripedProgress) + opts->animatedProgress=false; + return true; } } @@ -577,8 +603,10 @@ /* Set hard-coded defaults... */ opts->contrast=7; opts->highlightFactor=DEFAULT_HIGHLIGHT_FACTOR; + opts->round=ROUND_FULL; opts->lighterPopupMenuBgnd=true; opts->animatedProgress=true; + opts->stripedProgress=true; opts->highlightTab=true; opts->embolden=false; opts->appearance=APPEARANCE_BEVELLED; @@ -601,6 +629,8 @@ opts->scrollbarType=SCROLLBAR_KDE; opts->shadowButtons=FALSE; opts->stdFocus=FALSE; + opts->lvLines=FALSE; + opts->drawStatusBarFrames=FALSE; #ifdef __cplusplus opts->customMenubarsColor.setRgb(0, 0, 0); opts->customSlidersColor.setRgb(0, 0, 0); @@ -706,6 +736,20 @@ } } +static const char *toStr(ERound exp) +{ + switch(exp) + { + case ROUND_NONE: + return "none"; + case ROUND_SLIGHT: + return "slight"; + default: + case ROUND_FULL: + return "full"; + } +} + static const char *toStr(EScrollbar sb) { switch(sb) @@ -763,10 +807,12 @@ else { cfg->setGroup(QTC_GROUP); + CFG_WRITE_ENTRY(round); CFG_WRITE_ENTRY_D(highlightFactor); CFG_WRITE_ENTRY(toolbarBorders); CFG_WRITE_ENTRY(appearance); CFG_WRITE_ENTRY(fixParentlessDialogs); + CFG_WRITE_ENTRY(stripedProgress); CFG_WRITE_ENTRY(animatedProgress); CFG_WRITE_ENTRY(lighterPopupMenuBgnd); CFG_WRITE_ENTRY(embolden); @@ -792,6 +838,8 @@ CFG_WRITE_ENTRY(scrollbarType); CFG_WRITE_ENTRY(shadowButtons); CFG_WRITE_ENTRY(stdFocus); + CFG_WRITE_ENTRY(lvLines); + CFG_WRITE_ENTRY(drawStatusBarFrames); cfg->sync(); return true; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/gtk2/gtkrc-top new/QtCurve-Gtk2-0.48/gtk2/gtkrc-top --- old/QtCurve-Gtk2-0.47/gtk2/gtkrc-top 2007-03-06 23:18:50.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/gtk2/gtkrc-top 2007-03-14 22:11:09.000000000 +0100 @@ -19,7 +19,7 @@ GtkRange::slider_width = 15 GtkRange::slider_length = 24 GtkRange::stepper_size = 15 - GtkScale::slider_length = 13 + GtkScale::slider_length = 21 GtkScale::slider_width = 13 GtkScrollbar::min_slider_length = 16 GtkCheckButton::indicator_size = 13 @@ -81,6 +81,12 @@ style "qtcurve-w2" = "qtcurve-default" { xthickness = 2 + ythickness = 2 +} + +style "qtcurve-w2b" = "qtcurve-default" +{ + xthickness = 2 ythickness = 3 } @@ -119,7 +125,7 @@ class "GtkNotebook" style "qtcurve-w2" class "*Button" style "qtcurve-h2" class "GtkOptionMenu" style "qtcurve-h2" -class "GtkRange" style "qtcurve-w2" +class "GtkRange" style "qtcurve-w2b" class "GtkMenu" style "qtcurve-w2" class "GtkScrolledWindow" style "qtcurve-w2" class "*MenuBar" style "qtcurve-menubar" @@ -129,14 +135,14 @@ class "GtkStatusbar" style "qtcurve-default" class "GtkRadioButton" style "qtcurve-default" class "GtkCheckButton" style "qtcurve-default" -class "GtkSpinButton" style "qtcurve-w2" +class "GtkSpinButton" style "qtcurve-w2b" widget_class "*.GtkMenuItem.*" style "qtcurve-default" widget_class "*.GtkAccelMenuItem.*" style "qtcurve-default" widget_class "*.GtkRadioMenuItem.*" style "qtcurve-default" widget_class "*.GtkCheckMenuItem.*" style "qtcurve-default" widget_class "*.GtkImageMenuItem.*" style "qtcurve-default" widget_class "*.GtkSeparatorMenuItem.*" style "qtcurve-default" -class "GtkEntry" style "qtcurve-w2" +class "GtkEntry" style "qtcurve-w2b" widget_class "*.tooltips.*.GtkToggleButton" style "qtcurve-tasklist" widget_class "*Tree*GtkButton" style "qtcurve-default" widget_class "*List*GtkButton" style "qtcurve-default" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/gtk2/Makefile.am new/QtCurve-Gtk2-0.48/gtk2/Makefile.am --- old/QtCurve-Gtk2-0.47/gtk2/Makefile.am 2006-12-21 21:22:55.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/gtk2/Makefile.am 2007-03-09 00:20:30.000000000 +0100 @@ -7,11 +7,15 @@ firefox-user.js : firefox-user.js.in cat firefox-user.js.in | sed s:QTC_MOZILLA_DIR:$(mozilladir):g > firefox-user.js -pixmaps.h: radio_frame.png radio_light.png radio_on.png check_on.png +pixmaps.h: radio_frame.png radio_light.png radio_on.png check_on.png slider.png slider_light.png slider_v.png slider_light_v.png gdk-pixbuf-csource --raw --name radio_frame radio_frame.png > pixmaps.h gdk-pixbuf-csource --raw --name radio_light radio_light.png >> pixmaps.h gdk-pixbuf-csource --raw --name radio_on radio_on.png >> pixmaps.h gdk-pixbuf-csource --raw --name check_on check_on.png >> pixmaps.h + gdk-pixbuf-csource --raw --name slider slider.png >> pixmaps.h + gdk-pixbuf-csource --raw --name slider_light slider_light.png >> pixmaps.h + gdk-pixbuf-csource --raw --name slider_v slider_v.png >> pixmaps.h + gdk-pixbuf-csource --raw --name slider_light_v slider_light_v.png >> pixmaps.h qtcurve.lo: pixmaps.h @@ -26,7 +30,7 @@ themedir = $(GTK2_PREFIX)/share/themes/QtCurve/gtk-2.0 theme_DATA = gtkrc -EXTRA_DIST = gtkrc-top icons create_gtkrc.pl qt_settings.c QtCurve.css.in firefox-user.js.in mailto.sh preferences-rev.xml config_file.c animation.c radio_frame.png radio_light.png radio_on.png check_on.png pixmaps.h +EXTRA_DIST = gtkrc-top icons create_gtkrc.pl qt_settings.c QtCurve.css.in firefox-user.js.in mailto.sh preferences-rev.xml config_file.c animation.c radio_frame.png radio_light.png radio_on.png check_on.png slider.png slider_light.png slider_v.png slider_light_v.png pixmaps.h if build_icons diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/gtk2/Makefile.in new/QtCurve-Gtk2-0.48/gtk2/Makefile.in --- old/QtCurve-Gtk2-0.47/gtk2/Makefile.in 2007-03-06 23:19:12.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/gtk2/Makefile.in 2007-03-14 21:17:09.000000000 +0100 @@ -201,7 +201,7 @@ noinst_HEADERS = qtcurve.h common.h themedir = $(GTK2_PREFIX)/share/themes/QtCurve/gtk-2.0 theme_DATA = gtkrc -EXTRA_DIST = gtkrc-top icons create_gtkrc.pl qt_settings.c QtCurve.css.in firefox-user.js.in mailto.sh preferences-rev.xml config_file.c animation.c radio_frame.png radio_light.png radio_on.png check_on.png pixmaps.h +EXTRA_DIST = gtkrc-top icons create_gtkrc.pl qt_settings.c QtCurve.css.in firefox-user.js.in mailto.sh preferences-rev.xml config_file.c animation.c radio_frame.png radio_light.png radio_on.png check_on.png slider.png slider_light.png slider_v.png slider_light_v.png pixmaps.h all: all-am .SUFFIXES: @@ -518,11 +518,15 @@ firefox-user.js : firefox-user.js.in cat firefox-user.js.in | sed s:QTC_MOZILLA_DIR:$(mozilladir):g > firefox-user.js -pixmaps.h: radio_frame.png radio_light.png radio_on.png check_on.png +pixmaps.h: radio_frame.png radio_light.png radio_on.png check_on.png slider.png slider_light.png slider_v.png slider_light_v.png gdk-pixbuf-csource --raw --name radio_frame radio_frame.png > pixmaps.h gdk-pixbuf-csource --raw --name radio_light radio_light.png >> pixmaps.h gdk-pixbuf-csource --raw --name radio_on radio_on.png >> pixmaps.h gdk-pixbuf-csource --raw --name check_on check_on.png >> pixmaps.h + gdk-pixbuf-csource --raw --name slider slider.png >> pixmaps.h + gdk-pixbuf-csource --raw --name slider_light slider_light.png >> pixmaps.h + gdk-pixbuf-csource --raw --name slider_v slider_v.png >> pixmaps.h + gdk-pixbuf-csource --raw --name slider_light_v slider_light_v.png >> pixmaps.h qtcurve.lo: pixmaps.h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/gtk2/pixmaps.h new/QtCurve-Gtk2-0.48/gtk2/pixmaps.h --- old/QtCurve-Gtk2-0.47/gtk2/pixmaps.h 2006-10-19 21:21:16.000000000 +0200 +++ new/QtCurve-Gtk2-0.48/gtk2/pixmaps.h 2007-03-14 22:19:59.000000000 +0100 @@ -175,3 +175,241 @@ "\0\0\0\0"}; +/* GdkPixbuf RGBA C-Source image dump */ + +#ifdef __SUNPRO_C +#pragma align 4 (slider) +#endif +#ifdef __GNUC__ +static const guint8 slider[] __attribute__ ((__aligned__ (4))) = +#else +static const guint8 slider[] = +#endif +{ "" + /* Pixbuf magic (0x47646b50) */ + "GdkP" + /* length: header (24) + pixel_data (1092) */ + "\0\0\4\\" + /* pixdata_type (0x1010002) */ + "\1\1\0\2" + /* rowstride (84) */ + "\0\0\0T" + /* width (21) */ + "\0\0\0\25" + /* height (13) */ + "\0\0\0\15" + /* pixel_data: */ + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\25\0\0\0t\0\0\0\325\0\0\0\377\0\0\0\377" + "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" + "\0\0\0\325\0\0\0t\0\0\0\25\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0[\0\0\0\361\0\0\0\225\0\0\0J\0\0\0""2\0\0\0""2\0\0\0""2\0\0\0""2" + "\0\0\0""2\0\0\0""2\0\0\0""2\0\0\0""2\0\0\0""2\0\0\0H\0\0\0\224\0\0\0" + "\362\0\0\0[\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\322\0\0\0""8\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""4\0\0\0\323\0\0\0[\0\0\0\0\0\0\0" + "\25\0\0\0\360\0\0\0:\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0""6\0\0\0\360\0\0\0\25\0\0\0\263\0\0\0\227\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\227\0\0\0" + "t\0\0\0\325\0\0\0R\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0O\0\0\0\325\0\0\0\377\0\0\0>\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\377" + "\0\0\0\325\0\0\0U\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0P\0\0\0\325\0\0\0\263\0\0\0\235\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\234\0\0\0" + "t\0\0\0\25\0\0\0\363\0\0\0\77\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0:\0\0\0\363\0\0\0\25\0\0\0\0\0\0\0[\0\0\0\332\0\0\0" + "=\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""9\0\0\0\331\0\0\0[\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\364\0\0\0\237\0\0\0S\0\0\0""9\0\0\0""9" + "\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0""9\0\0\0" + "O\0\0\0\235\0\0\0\365\0\0\0[\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\25\0\0\0t\0\0\0\325\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0" + "\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\325\0\0\0t\0\0" + "\0\25\0\0\0\0\0\0\0\0\0\0\0\0"}; + + +/* GdkPixbuf RGBA C-Source image dump */ + +#ifdef __SUNPRO_C +#pragma align 4 (slider_light) +#endif +#ifdef __GNUC__ +static const guint8 slider_light[] __attribute__ ((__aligned__ (4))) = +#else +static const guint8 slider_light[] = +#endif +{ "" + /* Pixbuf magic (0x47646b50) */ + "GdkP" + /* length: header (24) + pixel_data (1092) */ + "\0\0\4\\" + /* pixdata_type (0x1010002) */ + "\1\1\0\2" + /* rowstride (84) */ + "\0\0\0T" + /* width (21) */ + "\0\0\0\25" + /* height (13) */ + "\0\0\0\15" + /* pixel_data: */ + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0!\0\0\0" + "`\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377" + "\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0\377\0\0\0`\0\0\0!\0\0\0\4\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0;\0\0\0\377\0\0\0\206\0\0\0\77\0\0\0" + "%\0\0\0%\0\0\0%\0\0\0%\0\0\0%\0\0\0%\0\0\0%\0\0\0%\0\0\0%\0\0\0\77\0" + "\0\0\206\0\0\0\377\0\0\0;\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0!\0\0\0\377\0" + "\0\0Y\0\0\0\14\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\14\0\0\0Y\0\0\0Y\0\0\0!\0\0" + "\0\0\0\0\0\0\0\0\0`\0\0\0\206\0\0\0\14\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0D\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\377\0\0\0-\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\206\0\0\0F\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0`\0\0\0{\0\0\0\12\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!\0\0\0""4\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\4\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0"}; + + +/* GdkPixbuf RGBA C-Source image dump */ + +#ifdef __SUNPRO_C +#pragma align 4 (slider_v) +#endif +#ifdef __GNUC__ +static const guint8 slider_v[] __attribute__ ((__aligned__ (4))) = +#else +static const guint8 slider_v[] = +#endif +{ "" + /* Pixbuf magic (0x47646b50) */ + "GdkP" + /* length: header (24) + pixel_data (1092) */ + "\0\0\4\\" + /* pixdata_type (0x1010002) */ + "\1\1\0\2" + /* rowstride (52) */ + "\0\0\0""4" + /* width (13) */ + "\0\0\0\15" + /* height (21) */ + "\0\0\0\25" + /* pixel_data: */ + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\25\0\0\0t\0\0\0\325\0\0\0\377\0\0\0\325" + "\0\0\0t\0\0\0\25\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0" + "\363\0\0\0\235\0\0\0U\0\0\0>\0\0\0R\0\0\0\227\0\0\0\360\0\0\0[\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\332\0\0\0\77\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0:\0\0\0\322\0\0\0[\0\0\0\0\0\0\0\25\0\0\0\364\0" + "\0\0=\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""8" + "\0\0\0\361\0\0\0\25\0\0\0t\0\0\0\237\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\225\0\0\0t\0\0\0\325\0" + "\0\0S\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0J\0\0\0\325\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0" + "\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0" + "9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0" + "\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2" + "\0\0\0\377\0\0\0\377\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""2\0\0\0\377\0\0\0\325\0\0\0O" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0H\0\0\0\325\0\0\0t\0\0\0\235\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\224\0\0\0t\0\0\0\25" + "\0\0\0\365\0\0\0""9\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0""4\0\0\0\362\0\0\0\25\0\0\0\0\0\0\0[\0\0\0\331\0\0\0:\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0""6\0\0\0\323\0\0\0[\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0[\0\0\0\363\0\0\0\234\0\0\0P\0\0\0""9\0\0\0" + "O\0\0\0\227\0\0\0\360\0\0\0[\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\25\0\0\0\263\0\0\0\325\0\0\0\377\0\0\0\325\0\0\0\263\0\0\0\25" + "\0\0\0\0\0\0\0\0\0\0\0\0"}; + + +/* GdkPixbuf RGBA C-Source image dump */ + +#ifdef __SUNPRO_C +#pragma align 4 (slider_light_v) +#endif +#ifdef __GNUC__ +static const guint8 slider_light_v[] __attribute__ ((__aligned__ (4))) = +#else +static const guint8 slider_light_v[] = +#endif +{ "" + /* Pixbuf magic (0x47646b50) */ + "GdkP" + /* length: header (24) + pixel_data (1092) */ + "\0\0\4\\" + /* pixdata_type (0x1010002) */ + "\1\1\0\2" + /* rowstride (52) */ + "\0\0\0""4" + /* width (13) */ + "\0\0\0\15" + /* height (21) */ + "\0\0\0\25" + /* pixel_data: */ + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0!\0" + "\0\0`\0\0\0\377\0\0\0\377\0\0\0\206\0\0\0`\0\0\0!\0\0\0\4\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\4\0\0\0;\0\0\0\377\0\0\0\206\0\0\0D\0\0\0-\0\0\0F" + "\0\0\0{\0\0\0""4\0\0\0\3\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0!\0\0\0\377\0\0" + "\0Y\0\0\0\14\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\12\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0`\0\0\0\206\0\0\0\14\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0" + "\0\77\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0%\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377" + "\0\0\0%\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0%\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\377\0\0\0%\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0%\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\377\0\0\0%\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0%\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\377\0\0\0%\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\377\0\0\0%\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\377\0\0\0\77\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0`\0\0\0\206\0\0\0\14" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0!\0\0\0\206\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0;\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\4\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0" + "\0\0\0\0\0"}; + + diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/gtk2/qtcurve.c new/QtCurve-Gtk2-0.48/gtk2/qtcurve.c --- old/QtCurve-Gtk2-0.47/gtk2/qtcurve.c 2007-03-06 23:18:50.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/gtk2/qtcurve.c 2007-03-14 22:12:06.000000000 +0100 @@ -1200,6 +1200,19 @@ break; case PIX_CHECK: res=gdk_pixbuf_new_from_inline(-1, check_on, TRUE, NULL); + break; + case PIX_SLIDER: + res=gdk_pixbuf_new_from_inline(-1, slider, TRUE, NULL); + break; + case PIX_SLIDER_LIGHT: + res=gdk_pixbuf_new_from_inline(-1, slider_light, TRUE, NULL); + break; + case PIX_SLIDER_V: + res=gdk_pixbuf_new_from_inline(-1, slider_v, TRUE, NULL); + break; + case PIX_SLIDER_LIGHT_V: + res=gdk_pixbuf_new_from_inline(-1, slider_light_v, TRUE, NULL); + break; } adjustPix(gdk_pixbuf_get_pixels(res), gdk_pixbuf_get_n_channels(res), gdk_pixbuf_get_width(res), @@ -1490,19 +1503,22 @@ DF_VERT = 0x080 } EDrawFlags; -static void drawBorder(GtkStyle *style, GdkWindow *window, GtkStateType state, GdkRectangle *area, - GdkRegion *region, gint x, gint y, gint width, gint height, - GdkColor *bgnd, GdkGC **c_gcs, GdkColor *c_colors, int round, - EBorder borderProfile, EWidget widget, int flags) +#define drawBorder(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p) \ +realDrawBorder(a, b, c, d, e, f, g, h, i, j, k, l, m, n, o, p, 5) + +static void realDrawBorder(GtkStyle *style, GdkWindow *window, GtkStateType state, GdkRectangle *area, + GdkRegion *region, gint x, gint y, gint width, gint height, + GdkColor *bgnd, GdkGC **c_gcs, GdkColor *c_colors, int round, + EBorder borderProfile, EWidget widget, int flags, int borderVal) { QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style; gboolean useText=WIDGET_DEF_BUTTON==widget && IND_FONT_COLOR==opts.defBtnIndicator && GTK_STATE_INSENSITIVE!=state; GdkColor *colors=c_colors ? c_colors : qtcurveStyle->background, - *border_col= useText ? &style->text[GTK_STATE_NORMAL] : &colors[5]; + *border_col= useText ? &style->text[GTK_STATE_NORMAL] : &colors[borderVal]; GdkGC *midgc=NULL, **gcs=c_gcs ? c_gcs : qtcurveStyle->background_gc, - *border_gc=useText ? style->text_gc[GTK_STATE_NORMAL] : gcs[5]; + *border_gc=useText ? style->text_gc[GTK_STATE_NORMAL] : gcs[borderVal]; if(area || region) { @@ -1514,6 +1530,12 @@ setClipping(border_gc, area, region); } + if(ROUND_FULL!=opts.round && flags&DF_LARGE_ARC) + flags-=DF_LARGE_ARC; + + if(ROUND_NONE==opts.round) + round=ROUNDED_NONE; + switch(borderProfile) { case BORDER_FLAT: @@ -1539,10 +1561,10 @@ if(GTK_STATE_INSENSITIVE!=state && (BORDER_SUNKEN==borderProfile || APPEARANCE_FLAT!=opts.appearance)) if(flags&DF_BLEND) - midgc=QTC_SET_MID_COLOR(&colors[BORDER_RAISED==borderProfile ? QT_FRAME_DARK_SHADOW : 0], - bgnd ? bgnd : &style->bg[GTK_STATE_NORMAL]) // Was base??? + midgc=QTC_SET_MID_COLOR(&colors[BORDER_RAISED==borderProfile ? QT_FRAME_DARK_SHADOW : 0], + bgnd ? bgnd : &style->bg[GTK_STATE_NORMAL]) // Was base??? else - midgc=gcs[BORDER_RAISED==borderProfile ? QT_FRAME_DARK_SHADOW : 0]; + midgc=gcs[BORDER_RAISED==borderProfile ? QT_FRAME_DARK_SHADOW : 0]; else midgc=style->bg_gc[state]; @@ -1714,10 +1736,9 @@ colouredMouseOver=opts.coloredMouseOver && qtcurveStyle->mouseover_gc[0] && GTK_STATE_PRELIGHT==state && !IS_SLIDER(widget) && (IS_TOGGLE_BUTTON(widget) || !sunken), - lightBorder=!sunken && IS_GLASS(opts.appearance) && WIDGET_MENU_ITEM!=widget && - WIDGET_PROGRESSBAR!=widget, + lightBorder=QTC_DRAW_LIGHT_BORDER(sunken, widget), bevelledButton=WIDGET_BUTTON(widget) && APPEARANCE_BEVELLED==opts.appearance, - doEtch=flags&DF_DO_BORDER && ETCH_WIDGET(widget); + doEtch=flags&DF_DO_BORDER && ETCH_WIDGET(widget) && ROUND_FULL==opts.round; int bx=x, by=y, bw=width, bh=height; if(doEtch) @@ -1739,7 +1760,7 @@ } } - if(lightBorder) + if(!colouredMouseOver && lightBorder) { if(flags&DF_VERT) { @@ -1786,7 +1807,7 @@ bx++; by++; bh-=2; bw-=2; } - if(lightBorder) + if(!colouredMouseOver && lightBorder) { GdkGC *lbGc=gcs[APPEARANCE_SHINY_GLASS==opts.appearance ? 0 : 1]; @@ -1918,15 +1939,19 @@ gint height, int round, gboolean isCombo) { QtCurveStyle *qtcurveStyle = (QtCurveStyle *)style; - gboolean highlight=widget && GTK_WIDGET_HAS_FOCUS(widget); + gboolean highlight=widget && GTK_WIDGET_HAS_FOCUS(widget), + doEtch=ROUND_FULL==opts.round; GdkGC **gcs=highlight ? qtcurveStyle->menuitem_gc : qtcurveStyle->background_gc, *bgnd_gc=style->bg_gc[state], *gc=NULL, *midgc=NULL; GdkColor *colors=highlight ? qtcurveStyle->menuitem : qtcurveStyle->background; - y++; - height-=2; + if(doEtch) + { + y++; + height-=2; + } #ifdef QTC_DEBUG printf("Draw entry_field %d %d %d %d %d %d ", state, x, y, width, height, round); @@ -1966,6 +1991,7 @@ drawBorder(style, window, state, area, NULL, x, y, width, height, NULL, gcs, colors, round, BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC|DF_DO_CORNERS); + if(doEtch) { GdkRectangle rect; GdkRegion *region=NULL; @@ -2692,12 +2718,13 @@ } else if(IND_COLORED==opts.defBtnIndicator && (COLORED_BORDER_SIZE>2)) { + int o=ROUND_FULL==opts.round ? 1 : 0; // offset needed because of etch GdkPoint outer[4]={ {x, y}, {x+width, y}, {x+width, y+height}, {x, y+height} }, - inner[4]={ {x+COLORED_BORDER_SIZE, y+(COLORED_BORDER_SIZE+1) }, - {x+width-COLORED_BORDER_SIZE, y+(COLORED_BORDER_SIZE+1)}, - {x+width-COLORED_BORDER_SIZE, y+height-(COLORED_BORDER_SIZE+1)}, - {x+COLORED_BORDER_SIZE, y+height-(COLORED_BORDER_SIZE+1)} }; + inner[4]={ {x+COLORED_BORDER_SIZE, y+(COLORED_BORDER_SIZE+o) }, + {x+width-COLORED_BORDER_SIZE, y+(COLORED_BORDER_SIZE+o)}, + {x+width-COLORED_BORDER_SIZE, y+height-(COLORED_BORDER_SIZE+o)}, + {x+COLORED_BORDER_SIZE, y+height-(COLORED_BORDER_SIZE+o)} }; GdkRegion *outer_region=gdk_region_polygon(outer, 4, GDK_EVEN_ODD_RULE), *inner_region=gdk_region_polygon(inner, 4, GDK_EVEN_ODD_RULE); @@ -3110,7 +3137,7 @@ gboolean active_mb=mb ? GTK_MENU_SHELL(mb)->active : FALSE; int animShift=-PROGRESS_CHUNK_WIDTH; - if(pbar) + if(pbar && opts.stripedProgress) { GdkRectangle rect={x, y, width-2, height-2}; int stripeOffset; @@ -3159,76 +3186,75 @@ } } -/* - switch(opts.appearance) { - default: -*/ + GdkColor *bgnd=qtcurveStyle->menubar_gc[0] && mb && GTK_APP_MOZILLA!=qtSettings.app + ? &qtcurveStyle->menubar[ORIGINAL_SHADE] : NULL; + int round=pbar ? progressbarRound(widget, rev) + : mb + ? active_mb + ? ROUNDED_TOP + : ROUNDED_ALL + : ROUNDED_ALL, + new_state=GTK_STATE_PRELIGHT==state ? GTK_STATE_NORMAL : state; + gboolean border=pbar || menuitem || mb, + stdColors=!mb || SHADE_BLEND_SELECTED!=opts.shadeMenubars; + + if(area) + gdk_gc_set_clip_rectangle(style->base_gc[state], area); + + if(pbar) + { + x++; y++; width-=2, height-=2; + } + else if(!border) { - GdkColor *bgnd=qtcurveStyle->menubar_gc[0] && mb && GTK_APP_MOZILLA!=qtSettings.app - ? &qtcurveStyle->menubar[ORIGINAL_SHADE] : NULL; - int round=pbar ? progressbarRound(widget, rev) - : mb - ? active_mb - ? ROUNDED_TOP - : ROUNDED_ALL - : ROUNDED_ALL, - new_state=GTK_STATE_PRELIGHT==state ? GTK_STATE_NORMAL : state; - gboolean border=pbar || menuitem || mb; + x--; y--; width+=2, height+=2; + } - if(area) - gdk_gc_set_clip_rectangle(style->base_gc[state], area); + drawLightBevel(style, window, new_state, area, NULL, x, y, + width, height, &qtcurveStyle->menuitem[ORIGINAL_SHADE], bgnd, + qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, + NULL, round, pbar ? WIDGET_PROGRESSBAR : WIDGET_MENU_ITEM, BORDER_FLAT, + DF_LARGE_ARC|DF_DRAW_INSIDE| + (border&&stdColors ? DF_DO_BORDER : 0)|DF_DO_FILL| + (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); - if(pbar) - { - x++; y++; width-=2, height-=2; - } - else if(!border) - { - x--; y--; width+=2, height+=2; - } + if(mb && !stdColors) + realDrawBorder(style, window, state, area, NULL, x, y, width, height, bgnd, + qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, round, BORDER_FLAT, + WIDGET_OTHER, DF_LARGE_ARC, 0); - drawLightBevel(style, window, new_state, area, NULL, x, y, - width, height, &qtcurveStyle->menuitem[ORIGINAL_SHADE], bgnd, + if(pbar && opts.stripedProgress) + drawLightBevel(style, window, new_state, NULL, region, x, y, + width, height, &qtcurveStyle->menuitem[1], NULL, qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, - NULL, round, pbar ? WIDGET_PROGRESSBAR : WIDGET_MENU_ITEM, BORDER_FLAT, - DF_LARGE_ARC|DF_DRAW_INSIDE|(border ? DF_DO_BORDER : 0)|DF_DO_FILL| + NULL, round, WIDGET_PROGRESSBAR, BORDER_FLAT, + DF_LARGE_ARC|DF_DRAW_INSIDE|DF_DO_BORDER|DF_DO_FILL| (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); + if(pbar && QTC_ROUNDED && ROUNDED_ALL!=round) + { + midgc=QTC_SET_MID_COLOR(&qtcurveStyle->menuitem[2], + &qtcurveStyle->background[ORIGINAL_SHADE]) - if(pbar) - drawLightBevel(style, window, new_state, NULL, region, x, y, - width, height, &qtcurveStyle->menuitem[1], NULL, - qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, - NULL, round, WIDGET_PROGRESSBAR, BORDER_FLAT, - DF_LARGE_ARC|DF_DRAW_INSIDE|DF_DO_BORDER|DF_DO_FILL| - (activeWindow && USE_SHADED_MENU_BAR_COLORS ? 0 : DF_DO_CORNERS)); - - if(pbar && ROUNDED_ALL!=round) + /*if(GTK_APP_MOZILLA!=qt_settings.app) { - midgc=QTC_SET_MID_COLOR(&qtcurveStyle->menuitem[2], - &qtcurveStyle->background[ORIGINAL_SHADE]) + x--; y--; width+=2; height+=2; + }*/ + if(!(round&CORNER_TL)) + gdk_draw_point(window, midgc, x, y); + if(!(round&CORNER_TR)) + gdk_draw_point(window, midgc, x+width-1, y); + if(!(round&CORNER_BR)) + gdk_draw_point(window, midgc, x+width-1, y+height-1); + if(!(round&CORNER_BL)) + gdk_draw_point(window, midgc, x, y+height-1); + } - /*if(GTK_APP_MOZILLA!=qt_settings.app) - { - x--; y--; width+=2; height+=2; - }*/ - if(!(round&CORNER_TL)) - gdk_draw_point(window, midgc, x, y); - if(!(round&CORNER_TR)) - gdk_draw_point(window, midgc, x+width-1, y); - if(!(round&CORNER_BR)) - gdk_draw_point(window, midgc, x+width-1, y+height-1); - if(!(round&CORNER_BL)) - gdk_draw_point(window, midgc, x, y+height-1); - } + if(area) + gdk_gc_set_clip_rectangle(style->base_gc[state], NULL); - if(area) - gdk_gc_set_clip_rectangle(style->base_gc[state], NULL); -/* - break; -*/ - } + } if(region) gdk_region_destroy(region); @@ -3327,15 +3353,15 @@ sanitizeSize(window, &width, &height); - if(!statusBar && (frame || profiledFrame)) + if(!statusBar && (frame || profiledFrame) && QTC_ROUNDED) { if(GTK_SHADOW_NONE!=shadow_type && - (!frame || GTK_APP_MOZILLA!=qtSettings.app)) + (!frame || opts.drawStatusBarFrames || GTK_APP_MOZILLA!=qtSettings.app)) drawBorder(style, window, state, area, NULL, x, y, width, height, NULL, NULL, NULL, ROUNDED_ALL, profiledFrame ? BORDER_SUNKEN : BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC|DF_BLEND|DF_DO_CORNERS); } - else if(!statusBar) + else if(!statusBar || opts.drawStatusBarFrames) { GdkGC *gc1, *gc2; @@ -3362,7 +3388,7 @@ break; case GTK_SHADOW_IN: case GTK_SHADOW_OUT: - if(frame) + if(frame || !QTC_ROUNDED) { gdk_draw_line(window, gc2, x, y, x+width-2, y); gdk_draw_line(window, gc2, x, y, x, y+height-2); @@ -4032,22 +4058,27 @@ GdkGC *fill, GdkColor *col, int x, int y, int width, int height, gboolean horiz, gboolean increase, EWidget tab, gboolean grad) { - EAppearance app=GTK_STATE_NORMAL==state ? QTC_SEL_TAB_APP : QTC_NORM_TAB_APP; - - if(grad && !IS_FLAT(app)) + if(GTK_STATE_NORMAL==state && APPEARANCE_INVERTED==opts.appearance) + gdk_draw_rectangle(window, style->bg_gc[GTK_STATE_NORMAL], TRUE, x, y, width, height); + else { - double s1=increase - ? SHADE_TAB_SEL_LIGHT - : SHADE_BOTTOM_TAB_SEL_DARK, - s2=increase - ? SHADE_TAB_SEL_DARK - : SHADE_BOTTOM_TAB_SEL_LIGHT; + EAppearance app=GTK_STATE_NORMAL==state ? QTC_SEL_TAB_APP : QTC_NORM_TAB_APP; + + if(grad && !IS_FLAT(app)) + { + double s1=increase + ? SHADE_TAB_SEL_LIGHT + : SHADE_BOTTOM_TAB_SEL_DARK, + s2=increase + ? SHADE_TAB_SEL_DARK + : SHADE_BOTTOM_TAB_SEL_LIGHT; - drawBevelGradient(style, window, area, NULL, x, y, width, height, - col, s1, s2, horiz, increase, FALSE, app, tab); + drawBevelGradient(style, window, area, NULL, x, y, width, height, + col, s1, s2, horiz, increase, FALSE, app, tab); + } + else + gdk_draw_rectangle(window, fill, TRUE, x, y, width, height); } - else - gdk_draw_rectangle(window, fill, TRUE, x, y, width, height); } static void gtkDrawExtension(GtkStyle *style, GdkWindow *window, GtkStateType state, @@ -4077,6 +4108,8 @@ reverseLayout(widget->parent); GdkColor *col=active ? &(style->bg[GTK_STATE_NORMAL]) : &(qtcurveStyle->background[2]); + GdkRectangle clipArea; + FN_CHECK /* f'in mozilla apps dont really use Gtk widgets - they just paint to a pixmap. So, no way of knowing @@ -4171,6 +4204,12 @@ break; } + clipArea.x=x; + clipArea.y=y; + clipArea.width=width; + clipArea.height=height; + area=&clipArea; + if(area) { gdk_gc_set_clip_rectangle(gc1, area); @@ -4194,58 +4233,38 @@ #endif fillTab(style, window, area, state, fill, col, x, y, width, height-1, TRUE, FALSE, WIDGET_TAB_BOT, NULL!=notebook); - gdk_draw_line(window, gc1, x+1, y , x+1, y+height-1); - if(active && ORIGINAL_SHADE!=dark) - { - gdk_draw_line(window, gc2, x+1, y+height-2, x+width-2, y+height-2); - gdk_draw_line(window, gc2, x+width-2, y, x+width-2, y+height-1); - } - gdk_draw_line(window, outer, x, y , x, y+height-2); - gdk_draw_line(window, outer, x+width-1, y, x+width-1, y+height-2); - if(active) - { - gdk_draw_line(window, outer, x+1, y+height-1, x+width-2, y+height-1); - gdk_draw_point(window, outer, x+1, y+height-2); - gdk_draw_point(window, outer, x+width-2, y+height-2); - gdk_draw_line(window, gc2, x, y+height-2, x+1, y+height-1); - gdk_draw_line(window, gc2, x+width-2, y+height-1, x+width-1, y+height-2); - } - else - gdk_draw_line(window, outer, firstTab ? x+1 : x, y+height-1, - lastTab ? x+width-2 : x+width-1, y+height-1); + + drawBorder(style, window, state, area, NULL, x, y-4, width, height+4, NULL, + qtcurveStyle->background_gc, qtcurveStyle->background, + active + ? ROUNDED_BOTTOM + : firstTab + ? ROUNDED_BOTTOMLEFT + : lastTab + ? ROUNDED_BOTTOMRIGHT + : ROUNDED_NONE, + active ? BORDER_RAISED : BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC); if(notebook && opts.highlightTab && active) { gdk_draw_line(window, selGc1, x+1, y+height-3, x+width-2, y+height-3); gdk_draw_line(window, selGc1, x+1, y+height-2, x+width-2, y+height-2); - gdk_draw_line(window, selGc2, x+2, y+height-1, x+width-3, y+height-1); - gdk_draw_line(window, selGc2, x+2, y+height-1, x+1, y+height-2); - gdk_draw_line(window, selGc2, x+width-3, y+height-1, x+width-2, y+height-2); + + clipArea.y=y+height-3; + clipArea.height=3; + realDrawBorder(style, window, state, &clipArea, NULL, x, y, width, height, NULL, + qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, ROUNDED_BOTTOM, + BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC, 3); } + if(notebook && opts.coloredMouseOver && highlight) { - gdk_draw_line(window, qtcurveStyle->mouseover_gc[1], x+(firstTab ? 2 : 0), y+height-2, - x+width-(lastTab ? 3 : 1), y+height-2); - gdk_draw_line(window, qtcurveStyle->mouseover_gc[3], x+(firstTab ? 2 : 0), y+height-1, - x+width-(lastTab ? 3 : 1), y+height-1); - } - if(!active) - { - if(firstTab) - { - gdk_draw_point(window, outer, x+1, y+height-2); - midgc=QTC_SET_MID_COLOR(&qtcurveStyle->background[5], &style->bg[GTK_STATE_NORMAL]) - gdk_draw_point(window, midgc, x, y+height-2); - gdk_draw_point(window, midgc, x+1, y+height-1); - } - if(lastTab) - { - gdk_draw_point(window, outer, x+width-2, y+height-2); - midgc=QTC_SET_MID_COLOR(&qtcurveStyle->background[5], &style->bg[GTK_STATE_NORMAL]) - gdk_draw_point(window, midgc, x+width-1, y+height-2); - gdk_draw_point(window, midgc, x+width-2, y+height-1); - } + gdk_draw_line(window, qtcurveStyle->mouseover_gc[1], x+(firstTab ? opts.round : 1), y+height-2, + x+width-((lastTab ? opts.round : 1)+1), y+height-2); + gdk_draw_line(window, qtcurveStyle->mouseover_gc[3], x+(firstTab ? opts.round : 1), y+height-1, + x+width-((lastTab ? opts.round : 1)+1), y+height-1); } + break; case GTK_POS_BOTTOM: /* => tabs are on top !!! */ #if GTK_CHECK_VERSION(2, 10, 0) @@ -4258,57 +4277,35 @@ fillTab(style, window, area, state, fill, col, x, y+1, width, height-1, TRUE, TRUE, WIDGET_TAB_TOP, NULL!=notebook); - gdk_draw_line(window, gc1, x+1, y+1 , x+width-2, y+1); - gdk_draw_line(window, gc1, x+1, y+1, x+1, y+height-1); + drawBorder(style, window, state, area, NULL, x, y, width, height+4, NULL, + qtcurveStyle->background_gc, qtcurveStyle->background, + active + ? ROUNDED_TOP + : firstTab + ? ROUNDED_TOPLEFT + : lastTab + ? ROUNDED_TOPRIGHT + : ROUNDED_NONE, + active ? BORDER_RAISED : BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC); - if(active && ORIGINAL_SHADE!=dark) - gdk_draw_line(window, gc2, x+width-2, y+1, x+width-2, y+height-1); - gdk_draw_line(window, outer, x, y+1, x, y+height-1); - gdk_draw_line(window, outer, x+width-1, y+1, x+width-1, y+height-1); - if(active) - { - gdk_draw_line(window, outer, x+1, y , x+width-2, y); - gdk_draw_point(window, outer, x+1, y+1); - gdk_draw_point(window, outer, x+width-2, y+1); - gdk_draw_line(window, gc2, x, y+1, x+1, y); - gdk_draw_line(window, gc2, x+width-2, y, x+width-1, y+1); - } - else - gdk_draw_line(window, outer,firstTab ? x+1 : x, y, - lastTab ? x+width-2 : x+width-1, y); if(notebook && opts.highlightTab && active) { gdk_draw_line(window, selGc1, x+1, y+2, x+width-2, y+2); gdk_draw_line(window, selGc1, x+1, y+1, x+width-2, y+1); - gdk_draw_line(window, selGc2, x+2, y, x+width-3, y); - gdk_draw_line(window, selGc2, x+2, y, x+1, y+1); - gdk_draw_line(window, selGc2, x+width-3, y, - x+width-2, y+1); + clipArea.y=y; + clipArea.height=3; + realDrawBorder(style, window, state, &clipArea, NULL, x, y, width, height, NULL, + qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, ROUNDED_TOP, + BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC, 3); } + if(notebook && opts.coloredMouseOver && highlight) { - gdk_draw_line(window, qtcurveStyle->mouseover_gc[0], x+(firstTab ? 2 : 0), y+1, - x+width-(lastTab ? 3 : 1), y+1); - gdk_draw_line(window, qtcurveStyle->mouseover_gc[3], x+(firstTab ? 2 : 0), y, - x+width-(lastTab ? 3 : 1), y); - } - if(!active) - { - if(firstTab) - { - gdk_draw_point(window, outer, x+1, y+1); - midgc=QTC_SET_MID_COLOR(&qtcurveStyle->background[5], &style->bg[GTK_STATE_NORMAL]) - gdk_draw_point(window, midgc, x, y+1); - gdk_draw_point(window, midgc, x+1, y); - } - if(lastTab) - { - gdk_draw_point(window, outer, x+width-2, y+1); - midgc=QTC_SET_MID_COLOR(&qtcurveStyle->background[5], &style->bg[GTK_STATE_NORMAL]) - gdk_draw_point(window, midgc, x+width-1, y+1); - gdk_draw_point(window, midgc, x+width-2, y); - } + gdk_draw_line(window, qtcurveStyle->mouseover_gc[0], x+(firstTab ? opts.round : 1), y+1, + x+width-((lastTab ? opts.round : 1)+1), y+1); + gdk_draw_line(window, qtcurveStyle->mouseover_gc[3], x+(firstTab ? opts.round : 1), y, + x+width-((lastTab ? opts.round : 1)+1), y); } break; case GTK_POS_LEFT: /* => tabs are on right !!! */ @@ -4318,62 +4315,38 @@ #endif fillTab(style, window, area, state, fill, col, x, y, width-1, height, FALSE, FALSE, WIDGET_TAB_BOT, NULL!=notebook); - gdk_draw_line(window, gc1, x, y+1, x+width-1, y+1); - if(active && ORIGINAL_SHADE!=dark) - { - gdk_draw_line(window, gc2, x+width-2, y+1, x+width-2, y+height-2); - gdk_draw_line(window, gc2, x, y+height-2, x+width-1, y+height-2); - } - gdk_draw_line(window, outer, x, y, x+width-2, y); - gdk_draw_line(window, outer, x, y+height-1, x+width-2, y+height-1); + drawBorder(style, window, state, area, NULL, x-4, y, width+4, height, NULL, + qtcurveStyle->background_gc, qtcurveStyle->background, + active + ? ROUNDED_RIGHT + : firstTab + ? ROUNDED_TOPRIGHT + : lastTab + ? ROUNDED_BOTTOMRIGHT + : ROUNDED_NONE, + active ? BORDER_RAISED : BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC); - if(active) - { - gdk_draw_line(window, outer, x+width-1, y+1, x+width-1, y+height-2); - gdk_draw_point(window, outer, x+width-2, y+1); - gdk_draw_point(window, outer, x+width-2, y+height-2); - gdk_draw_line(window, gc2, x+width-2, y, x+width-1, y+1); - gdk_draw_line(window, gc2, x+width-2, y+height-1, x+width-1, y+height-2); - } - else - gdk_draw_line(window, outer, x+width-1, - firstTab ? y+1 : y, x+width-1, - lastTab ? y+height-2 : y+height-1); if(notebook && opts.highlightTab && active) { gdk_draw_line(window, selGc1, x+width-3, y+1, x+width-3, y+height-2); gdk_draw_line(window, selGc1, x+width-2, y+1, x+width-2, y+height-2); - gdk_draw_line(window, selGc2, x+width-1, y+2, x+width-1, y+height-3); - gdk_draw_line(window, selGc2, x+width-1, y+2, x+width-2, y+1); - gdk_draw_line(window, selGc2, x+width-1, y+height-3, - x+width-2, y+height-2); + + clipArea.x=x+width-3; + clipArea.width=3; + realDrawBorder(style, window, state, &clipArea, NULL, x, y, width, height, NULL, + qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, ROUNDED_RIGHT, + BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC, 3); } + if(notebook && opts.coloredMouseOver && highlight) { gdk_draw_line(window, qtcurveStyle->mouseover_gc[1], - x+width-2, y+(firstTab ? 2 : 0), x+width-2, - y+height-(lastTab ? 3 : 1)); + x+width-2, y+(firstTab ? opts.round : 1), x+width-2, + y+height-((lastTab ? opts.round : 1)+1)); gdk_draw_line(window, qtcurveStyle->mouseover_gc[3], - x+width-1, y+(firstTab ? 2 : 0), x+width-1, - y+height-(lastTab ? 3 : 1)); - } - if(!active) - { - if(firstTab) - { - gdk_draw_point(window, outer, x+width-2, y+1); - midgc=QTC_SET_MID_COLOR(&qtcurveStyle->background[5], &style->bg[GTK_STATE_NORMAL]) - gdk_draw_point(window, midgc, x+width-1, y+1); - gdk_draw_point(window, midgc, x+width-2, y); - } - if(lastTab) - { - gdk_draw_point(window, outer, x+width-2, y+height-2); - midgc=QTC_SET_MID_COLOR(&qtcurveStyle->background[5], &style->bg[GTK_STATE_NORMAL]) - gdk_draw_point(window, midgc, x+width-1, y+height-2); - gdk_draw_point(window, midgc, x+width-2, y+height-1); - } + x+width-1, y+(firstTab ? opts.round : 1), x+width-1, + y+height-((lastTab ? opts.round : 1)+1)); } break; case GTK_POS_RIGHT: /* => tabs are on left !!! */ @@ -4386,55 +4359,36 @@ #endif fillTab(style, window, area, state, fill, col, x+1, y, width-1, height, FALSE, TRUE, WIDGET_TAB_TOP, NULL!=notebook); - gdk_draw_line(window, gc1, x+1, y+1, x+1, y+height-2); - gdk_draw_line(window, gc1, x, y+1, x+width-1, y+1); - if(active && ORIGINAL_SHADE!=dark) - gdk_draw_line(window, gc2, x, y+height-2, x+width-1, y+height-2); - gdk_draw_line(window, outer, x+1, y, x+width-1, y); - gdk_draw_line(window, outer, x+1, y+height-1, x+width-1, y+height-1); - if(active) - { - gdk_draw_line(window, outer, x, y+1, x, y+height-2); - gdk_draw_point(window, outer, x+1, y+1); - gdk_draw_point(window, outer, x+1, y+height-2); - gdk_draw_line(window, gc2, x, y+1, x+1, y); - gdk_draw_line(window, gc2, x, y+height-2, x+1, y+height-1); - } - else - gdk_draw_line(window, outer, x, firstTab ? y+1 : y, x, - lastTab ? y+height-2 : y+height-1); + + drawBorder(style, window, state, area, NULL, x, y, width+4, height, NULL, + qtcurveStyle->background_gc, qtcurveStyle->background, + active + ? ROUNDED_LEFT + : firstTab + ? ROUNDED_TOPLEFT + : lastTab + ? ROUNDED_BOTTOMLEFT + : ROUNDED_NONE, + active ? BORDER_RAISED : BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC); if(notebook && opts.highlightTab && active) { gdk_draw_line(window, selGc1, x+2, y+1, x+2, y+height-2); gdk_draw_line(window, selGc1, x+1, y+1, x+1, y+height-2); - gdk_draw_line(window, selGc2, x, y+2, x, y+height-3); - gdk_draw_line(window, selGc2, x, y+2, x+1, y+1); - gdk_draw_line(window, selGc2, x, y+height-3, x+1, y+height-2); + + clipArea.x=x; + clipArea.width=3; + realDrawBorder(style, window, state, &clipArea, NULL, x, y, width, height, NULL, + qtcurveStyle->menuitem_gc, qtcurveStyle->menuitem, ROUNDED_LEFT, + BORDER_FLAT, WIDGET_OTHER, DF_LARGE_ARC, 3); } + if(notebook && opts.coloredMouseOver && highlight) { - gdk_draw_line(window, qtcurveStyle->mouseover_gc[0], x+1, y+(firstTab ? 2 : 0), x+1, - y+height-(lastTab ? 3 : 1)); - gdk_draw_line(window, qtcurveStyle->mouseover_gc[3], x, y+(firstTab ? 2 : 0), x, - y+height-(lastTab ? 3 : 1)); - } - if(!active) - { - if(firstTab) - { - gdk_draw_point(window, outer, x+1, y+1); - midgc=QTC_SET_MID_COLOR(&qtcurveStyle->background[5], &style->bg[GTK_STATE_NORMAL]) - gdk_draw_point(window, midgc, x, y+1); - gdk_draw_point(window, midgc, x+1, y); - } - if(lastTab) - { - gdk_draw_point(window, outer, x+1, y+height-2); - midgc=QTC_SET_MID_COLOR(&qtcurveStyle->background[5], &style->bg[GTK_STATE_NORMAL]) - gdk_draw_point(window, midgc, x, y+height-2); - gdk_draw_point(window, midgc, x+1, y+height-1); - } + gdk_draw_line(window, qtcurveStyle->mouseover_gc[0], x+1, y+(firstTab ? opts.round : 1), x+1, + y+height-((lastTab ? opts.round : 1)+1)); + gdk_draw_line(window, qtcurveStyle->mouseover_gc[3], x, y+(firstTab ? opts.round : 1), x, + y+height-((lastTab ? opts.round : 1)+1)); } break; } @@ -4496,7 +4450,7 @@ FN_CHECK sanitizeSize(window, &width, &height); - if(scrollbar) + if(scrollbar || ROUND_FULL!=opts.round) { gtk_paint_box(style, window, state, shadow_type, area, widget, detail, x, y, width, height); @@ -4526,36 +4480,38 @@ } else { - gboolean coloredMouseOver=GTK_STATE_PRELIGHT==state && opts.coloredMouseOver; - int bgnd=getFill(state, FALSE); + gboolean coloredMouseOver=GTK_STATE_PRELIGHT==state && opts.coloredMouseOver, + horiz=width>height; + int bgnd=getFill(state, FALSE), + xo=horiz ? 8 : 0, + yo=horiz ? 0 : 8; GdkGC **gcs=coloredMouseOver ? qtcurveStyle->mouseover_gc : btn_gcs; GdkColor *colors=coloredMouseOver ? qtcurveStyle->mouseover : btn_colors; - GdkPoint clip[8]= {{x, y+8}, {x, y+4}, {x+4, y}, {x+8, y}, - { x+12, y+4}, {x+12, y+8}, {x+8, y+12}, {x+4, y+12} }; + GdkPoint clip[8]= {{x, y+8+yo}, {x, y+4}, {x+4, y}, {x+8+xo, y}, + { x+12+xo, y+4}, {x+12+xo, y+8+yo}, {x+8+xo, y+12+yo}, {x+4, y+12+yo} }; GdkRegion *region=gdk_region_polygon(clip, 8, GDK_EVEN_ODD_RULE); if(APPEARANCE_FLAT==opts.appearance || APPEARANCE_RAISED==opts.appearance) { gdk_gc_set_clip_region(gcs[bgnd], region); - gdk_draw_rectangle(window, gcs[bgnd], TRUE, x+1, y+1, QTC_RADIO_SIZE-2, QTC_RADIO_SIZE-2); + gdk_draw_rectangle(window, gcs[bgnd], TRUE, x+1, y+1, width-2, height-2); gdk_gc_set_clip_region(gcs[bgnd], NULL); } else - drawBevelGradient(style, window, NULL, region, x+1, y+1, QTC_RADIO_SIZE-2, - QTC_RADIO_SIZE-2, &colors[bgnd], + drawBevelGradient(style, window, NULL, region, x+1, y+1, width-2, height-2, &colors[bgnd], SHADE_BEVEL_GRAD_LIGHT, SHADE_BEVEL_GRAD_DARK, - TRUE, TRUE, FALSE,APPEARANCE_GRADIENT, WIDGET_OTHER); + horiz, TRUE, FALSE, opts.appearance, WIDGET_OTHER); gdk_region_destroy(region); { - GdkPixbuf *border=getPixbuf(&colors[coloredMouseOver ? 4 : 5], PIX_RADIO_BORDER, - 0.8), - *light=getPixbuf(&colors[0], PIX_RADIO_LIGHT, 1.0); + GdkPixbuf *border=getPixbuf(&colors[coloredMouseOver ? 4 : 5], + horiz ? PIX_SLIDER : PIX_SLIDER_V, 0.8), + *light=getPixbuf(&colors[0], horiz ? PIX_SLIDER_LIGHT : PIX_SLIDER_LIGHT_V, 1.0); gdk_draw_pixbuf(window, btn_gcs[bgnd], border, 0, 0, x, y, gdk_pixbuf_get_width(border), gdk_pixbuf_get_height(border), GDK_RGB_DITHER_MAX, 0, 0); @@ -4717,6 +4673,12 @@ x++; y++; width-=2; height-=2; } + /* If we're not full rounded, then we need to remove the offset that was required for the etching... */ + if(GTK_IS_BUTTON(widget) && ROUND_FULL!=opts.round) + { + y--; height+=2; + } + if(opts.stdFocus) parent_class->draw_focus(style, window, state, area, widget, detail, x, y, width, height); else @@ -5247,7 +5209,7 @@ { qtInit(&opts); #ifdef QTC_ADD_EVENT_FILTER - qt_add_event_filter(); + qtcAddEventFilter(); #endif } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/QtCurve-Gtk2-0.47/gtk2/qt_settings.c new/QtCurve-Gtk2-0.48/gtk2/qt_settings.c --- old/QtCurve-Gtk2-0.47/gtk2/qt_settings.c 2007-03-06 23:18:50.000000000 +0100 +++ new/QtCurve-Gtk2-0.48/gtk2/qt_settings.c 2007-03-14 22:04:36.000000000 +0100 @@ -956,7 +956,7 @@ return GDK_FILTER_CONTINUE; } -static void addEventFilter() /* GdkWindow *widget) */ +static void qtcAddEventFilter() /* GdkWindow *widget) */ { static int done=0; Files old/QtCurve-Gtk2-0.47/gtk2/slider_light.png and new/QtCurve-Gtk2-0.48/gtk2/slider_light.png differ Files old/QtCurve-Gtk2-0.47/gtk2/slider_light_v.png and new/QtCurve-Gtk2-0.48/gtk2/slider_light_v.png differ Files old/QtCurve-Gtk2-0.47/gtk2/slider.png and new/QtCurve-Gtk2-0.48/gtk2/slider.png differ Files old/QtCurve-Gtk2-0.47/gtk2/slider_v.png and new/QtCurve-Gtk2-0.48/gtk2/slider_v.png differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org