Hello community,
here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory
checked in at Tue Mar 2 12:43:57 CET 2010.
--------
--- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-02-10 14:17:33.000000000 +0100
+++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-03-01 21:01:41.000000000 +0100
@@ -1,0 +2,12 @@
+Mon Mar 1 20:51:11 CET 2010 - dimstar@opensuse.org
+
+- Update to version 1.1.1:
+ + Alter alpha settings of square rings.
+ + Fix progressbar glow sometimes disappearing with Firefox.
+- Changes from version 1.1.0
+ + Add option to not embolden progressbar text.
+ + Add option to allow coloured mouse over for toolbar buttons.
+ + Add option to border selection.
+ + Add option to draw square rings on background.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
QtCurve-Gtk2-1.0.2.tar.bz2
New:
----
QtCurve-Gtk2-1.1.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ qtcurve-gtk2.spec ++++++
--- /var/tmp/diff_new_pack.vgEHss/_old 2010-03-02 12:43:51.000000000 +0100
+++ /var/tmp/diff_new_pack.vgEHss/_new 2010-03-02 12:43:51.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package qtcurve-gtk2 (Version 1.0.2)
+# spec file for package qtcurve-gtk2 (Version 1.1.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
Name: qtcurve-gtk2
-Version: 1.0.2
+Version: 1.1.1
Release: 1
License: GPLv2+
Summary: QtCurve style for Gtk2
++++++ QtCurve-Gtk2-1.0.2.tar.bz2 -> QtCurve-Gtk2-1.1.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.0.2/CMakeLists.txt new/QtCurve-Gtk2-1.1.1/CMakeLists.txt
--- old/QtCurve-Gtk2-1.0.2/CMakeLists.txt 2010-01-31 19:34:42.000000000 +0100
+++ new/QtCurve-Gtk2-1.1.1/CMakeLists.txt 2010-02-25 21:51:58.000000000 +0100
@@ -7,8 +7,8 @@
set(DEBIAN_PACKAGE_SECTION "gtk")
set(CPACK_SOURCE_GENERATOR "TBZ2")
set(CPACK_PACKAGE_VERSION_MAJOR "1")
-set(CPACK_PACKAGE_VERSION_MINOR "0")
-set(CPACK_PACKAGE_VERSION_PATCH "2")
+set(CPACK_PACKAGE_VERSION_MINOR "1")
+set(CPACK_PACKAGE_VERSION_PATCH "1")
set(CPACK_PACKAGE_CONTACT "Craig Drummond ")
set(QTCURVE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
set(QTCURVE_VERSION_FULL "${QTCURVE_VERSION}.${CPACK_PACKAGE_VERSION_PATCH}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.0.2/ChangeLog new/QtCurve-Gtk2-1.1.1/ChangeLog
--- old/QtCurve-Gtk2-1.0.2/ChangeLog 2010-01-31 19:34:42.000000000 +0100
+++ new/QtCurve-Gtk2-1.1.1/ChangeLog 2010-02-25 21:51:58.000000000 +0100
@@ -1,3 +1,15 @@
+1.1.1
+-----
+1. Alter alpha settings of square rings.
+2. Fix progressbar glow sometimes disappearing with Firefox.
+
+1.1.0
+-----
+1. Add option to not embolden progressbar text.
+2. Add option to allow coloured mouse over for toolbar buttons.
+3. Add option to border selection.
+4. Add option to draw square rings on background.
+
1.0.2
-----
1. Apply cygwin patches from Yaakov S - use MODULE istead of SHARED.
@@ -5,8 +17,8 @@
3. Map edit-select-all.png to gtk-select-all
4. Fix check, radio, expander, and splitter background highlighting - forgot
to convert configured value to a percentage!
-5. If using a background gradient, or cannot deternine a widget's parent's
- background colour - usr a 10% alpha white as the etch colour.
+5. If using a background gradient, or cannot determine a widget's parent's
+ background colour - use a 10% alpha white as the etch colour.
1.0.1
-----
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.0.2/common/common.h new/QtCurve-Gtk2-1.1.1/common/common.h
--- old/QtCurve-Gtk2-1.0.2/common/common.h 2010-01-31 19:34:42.000000000 +0100
+++ new/QtCurve-Gtk2-1.1.1/common/common.h 2010-02-25 21:51:58.000000000 +0100
@@ -58,10 +58,6 @@
#define QTC_INCREASE_SB_SLIDER
/*
- Control whether toolbar, window decoration, and dock window, buttons should have coloured mouse-over
-*/
-#define QTC_DONT_COLOUR_MOUSEOVER_TBAR_BUTTONS
-/*
Control shading used for glass variants.
0 => As used in 0.51.1 +
1 => As used in 0.51
@@ -355,10 +351,17 @@
#define QTC_ETCH_RADIO_BOTTOM_ALPHA 1.0
// #endif
-#define QTC_RINGS_INNER_ALPHA(T) qtcRingAlpha[IMG_PLAIN_RINGS==T ? 0 : 1] //(IMG_PLAIN_RINGS==opts.bgndImage.type ? 0.25 : 0.125)
+#define QTC_RINGS_INNER_ALPHA(T) qtcRingAlpha[IMG_PLAIN_RINGS==T] //(IMG_PLAIN_RINGS==opts.bgndImage.type ? 0.25 : 0.125)
#define QTC_RINGS_OUTER_ALPHA qtcRingAlpha[2] //0.5
-#define QTC_RINGS_WIDTH 450
-#define QTC_RINGS_HEIGHT 360
+#define QTC_RINGS_WIDTH(T) (IMG_SQUARE_RINGS==T ? 260 : 450)
+#define QTC_RINGS_HEIGHT(T) (IMG_SQUARE_RINGS==T ? 220 : 360)
+
+#define QTC_RINGS_SQUARE_LARGE_ALPHA (QTC_RINGS_OUTER_ALPHA*0.675)
+#define QTC_RINGS_SQUARE_SMALL_ALPHA (QTC_RINGS_OUTER_ALPHA*0.50)
+#define QTC_RINGS_SQUARE_LINE_WIDTH 20.0
+#define QTC_RINGS_SQUARE_RADIUS 18.0
+#define QTC_RINGS_SQUARE_LARGE_SIZE 120.0
+#define QTC_RINGS_SQUARE_SMALL_SIZE 100.0
#define QTC_CUSTOM_BGND (!(IS_FLAT(opts.bgndAppearance)) || IMG_NONE!=opts.bgndImage.type)
@@ -382,10 +385,11 @@
QtC_TitleBarEffect
} QtCMetrics;
-#define QtC_StateKWin ((QStyle::StateFlag)0x10000000)
-#define QtC_StateKWinShaded ((QStyle::StateFlag)0x20000000)
-#define QtC_StateKWinNotFull ((QStyle::StateFlag)0x40000000)
-#define QtC_StateKWinNoBorder ((QStyle::StateFlag)0x80000000)
+#define QtC_StateKWin ((QStyle::StateFlag)0x10000000)
+#define QtC_StateKWinNotFull ((QStyle::StateFlag)0x20000000)
+#define QtC_StateKWinNoBorder ((QStyle::StateFlag)0x40000000)
+#define QtC_StateKWinCompositing ((QStyle::StateFlag)0x80000000)
+#define QtC_StateKWinTabDrag ((QStyle::StateFlag)0x00000001)
#define CLOSE_COLOR QColor(191, 82, 82)
#define QTC_DARK_WINDOW_TEXT(A) ((A).red()<230 || (A).green()<230 || (A).blue()<230)
@@ -452,6 +456,7 @@
IMG_NONE,
IMG_BORDERED_RINGS,
IMG_PLAIN_RINGS,
+ IMG_SQUARE_RINGS,
IMG_FILE
} EImageType;
@@ -937,6 +942,7 @@
colorSliderMouseOver,
thinSbarGroove,
flatSbarButtons,
+ borderSbarGroove,
popupBorder,
unifySpinBtns,
unifyCombo,
@@ -956,7 +962,10 @@
forceAlternateLvCols,
squareLvSelection,
invertBotTab,
- menubarHiding;
+ menubarHiding,
+ boldProgress,
+ coloredTbarMo,
+ borderSelection;
EGlow glowProgress;
ELvLines lvLines;
EGradType bgndGrad,
@@ -1026,6 +1035,7 @@
#if defined __cplusplus
EAlign titlebarAlignment;
EEffect titlebarEffect;
+ bool centerTabText;
#endif
double customShades[NUM_STD_SHADES];
#ifdef __cplusplus
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.0.2/common/config_file.c new/QtCurve-Gtk2-1.1.1/common/config_file.c
--- old/QtCurve-Gtk2-1.0.2/common/config_file.c 2010-01-31 19:34:42.000000000 +0100
+++ new/QtCurve-Gtk2-1.1.1/common/config_file.c 2010-02-25 21:51:58.000000000 +0100
@@ -461,6 +461,8 @@
return IMG_PLAIN_RINGS;
if(0==memcmp(str, "rings", 5))
return IMG_BORDERED_RINGS;
+ if(0==memcmp(str, "squarerings", 11))
+ return IMG_SQUARE_RINGS;
if(0==memcmp(str, "file", 4))
return IMG_FILE;
}
@@ -1459,6 +1461,7 @@
QTC_CFG_READ_BOOL(etchEntry)
QTC_CFG_READ_INT_BOOL(splitterHighlight, opts->highlightFactor)
QTC_CFG_READ_BOOL(flatSbarButtons)
+ QTC_CFG_READ_BOOL(borderSbarGroove)
QTC_CFG_READ_BOOL(popupBorder)
QTC_CFG_READ_BOOL(unifySpinBtns)
QTC_CFG_READ_BOOL(unifySpin)
@@ -1472,6 +1475,9 @@
QTC_CFG_READ_BOOL(squareLvSelection)
QTC_CFG_READ_BOOL(invertBotTab)
QTC_CFG_READ_BOOL(menubarHiding)
+ QTC_CFG_READ_BOOL(boldProgress)
+ QTC_CFG_READ_BOOL(coloredTbarMo)
+ QTC_CFG_READ_BOOL(borderSelection)
#if defined QTC_CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
QTC_CFG_READ_BOOL(stdBtnSizes)
QTC_CFG_READ_BOOL(titlebarBorder)
@@ -1497,6 +1503,7 @@
QTC_CFG_READ_EFFECT(titlebarEffect)
QTC_CFG_READ_BOOL(gtkComboMenus)
QTC_CFG_READ_BOOL(colorTitlebarOnly)
+ QTC_CFG_READ_BOOL(centerTabText)
/*
#else
QTC_CFG_READ_BOOL(setDialogButtonOrder)
@@ -2122,6 +2129,7 @@
opts->highlightScrollViews=false;
opts->etchEntry=false;
opts->flatSbarButtons=true;
+ opts->borderSbarGroove=true;
opts->popupBorder=true;
opts->unifySpinBtns=false;
opts->unifySpin=true;
@@ -2135,6 +2143,9 @@
opts->squareLvSelection=false;
opts->invertBotTab=true;
opts->menubarHiding=false;
+ opts->boldProgress=true;
+ opts->coloredTbarMo=false;
+ opts->borderSelection=false;
#if defined QTC_CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000))
opts->stdBtnSizes=false;
opts->titlebarBorder=true;
@@ -2162,6 +2173,7 @@
opts->customMenuStripeColor.setRgb(0, 0, 0);
opts->titlebarAlignment=ALIGN_FULL_CENTER;
opts->titlebarEffect=EFFECT_SHADOW;
+ opts->centerTabText=false;
#if defined QT_VERSION && (QT_VERSION >= 0x040000)
opts->xbar=false;
opts->dwtSettings=QTC_DWT_BUTTONS_AS_PER_TITLEBAR|QTC_DWT_ROUND_TOP_ONLY;
@@ -2585,6 +2597,8 @@
return "plainrings";
case IMG_BORDERED_RINGS:
return "rings";
+ case IMG_SQUARE_RINGS:
+ return "squarerings";
case IMG_FILE:
return "file";
}
@@ -2788,6 +2802,7 @@
CFG_WRITE_ENTRY_NUM(splitterHighlight)
CFG_WRITE_ENTRY_NUM(expanderHighlight)
CFG_WRITE_ENTRY(flatSbarButtons)
+ CFG_WRITE_ENTRY(borderSbarGroove)
CFG_WRITE_ENTRY(popupBorder)
CFG_WRITE_ENTRY(unifySpinBtns)
CFG_WRITE_ENTRY(unifySpin)
@@ -2801,6 +2816,9 @@
CFG_WRITE_ENTRY(squareLvSelection)
CFG_WRITE_ENTRY(invertBotTab)
CFG_WRITE_ENTRY(menubarHiding)
+ CFG_WRITE_ENTRY(boldProgress)
+ CFG_WRITE_ENTRY(coloredTbarMo)
+ CFG_WRITE_ENTRY(borderSelection)
#if defined QT_VERSION && (QT_VERSION >= 0x040000)
CFG_WRITE_ENTRY(xbar)
CFG_WRITE_ENTRY_NUM(dwtSettings)
@@ -2854,6 +2872,7 @@
CFG_WRITE_ENTRY(mapKdeIcons)
CFG_WRITE_ENTRY(shading)
CFG_WRITE_ENTRY(titlebarAlignment)
+ CFG_WRITE_ENTRY(centerTabText)
#if defined QT_VERSION && (QT_VERSION >= 0x040000)
QTC_WRITE_STRING_LIST_ENTRY(noBgndGradientApps)
QTC_WRITE_STRING_LIST_ENTRY(noBgndImageApps)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.0.2/style/qt_settings.c new/QtCurve-Gtk2-1.1.1/style/qt_settings.c
--- old/QtCurve-Gtk2-1.0.2/style/qt_settings.c 2010-01-31 19:34:42.000000000 +0100
+++ new/QtCurve-Gtk2-1.1.1/style/qt_settings.c 2010-02-25 21:51:58.000000000 +0100
@@ -2405,15 +2405,16 @@
static const char *constGrpBoxBoldSuffix="widget_class \"*Frame.GtkLabel\" style \""QTC_RC_SETTING"BFnt\" "
"widget_class \"*Statusbar.*Frame.GtkLabel\" style \""QTC_RC_SETTING"Fnt\"";
tmpStr=(char *)realloc(tmpStr, strlen(constStdPrefix)+strlen(qtSettings.fonts[FONT_GENERAL])+strlen(constStdSuffix)+
- strlen(constBoldPrefix)+strlen(qtSettings.fonts[FONT_BOLD])+strlen(constBoldSuffix)+
+ strlen(constBoldPrefix)+strlen(qtSettings.fonts[FONT_BOLD])+
+ (opts.boldProgress ? strlen(constBoldSuffix) : strlen(constStdSuffix))+
strlen(constGrpBoxBoldSuffix)+1);
sprintf(tmpStr, "%s%s%s%s%s%s%s",
constStdPrefix, qtSettings.fonts[FONT_GENERAL], constStdSuffix,
- constBoldPrefix, qtSettings.fonts[FONT_BOLD], constBoldSuffix,
+ constBoldPrefix, qtSettings.fonts[FONT_BOLD], opts.boldProgress ? constBoldSuffix : constStdSuffix,
constGrpBoxBoldSuffix);
}
- else
+ else if(opts.boldProgress)
{
tmpStr=(char *)realloc(tmpStr, strlen(constBoldPrefix)+strlen(qtSettings.fonts[FONT_BOLD])+strlen(constBoldSuffix)+1);
sprintf(tmpStr, "%s%s%s", constBoldPrefix, qtSettings.fonts[FONT_BOLD], constBoldSuffix);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.0.2/style/qtcurve.c new/QtCurve-Gtk2-1.1.1/style/qtcurve.c
--- old/QtCurve-Gtk2-1.0.2/style/qtcurve.c 2010-01-31 19:34:42.000000000 +0100
+++ new/QtCurve-Gtk2-1.1.1/style/qtcurve.c 2010-02-25 21:51:58.000000000 +0100
@@ -1584,6 +1584,9 @@
int xe=x, ye=y, we=width, he=height, origWidth=width, origHeight=height;
double xd=x+0.5, yd=y+0.5;
+ if(WIDGET_TROUGH==widget && !opts.borderSbarGroove && flags&DF_DO_BORDER)
+ flags-=DF_DO_BORDER;
+
if(WIDGET_COMBO_BUTTON==widget && doEtch)
if(ROUNDED_RIGHT==round)
x--, xd-=1, width++;
@@ -1595,7 +1598,16 @@
if(width>0 && height>0)
{
- clipPath(cr, x, y, width, height, widget, RADIUS_EXTERNAL, round);
+ if(!(flags&DF_DO_BORDER))
+ {
+ cairo_new_path(cr);
+ cairo_save(cr);
+ createPath(cr, x, y, width, height, getRadius(&opts, width, height, widget, RADIUS_EXTERNAL), round);
+ cairo_clip(cr);
+ }
+ else
+ clipPath(cr, x, y, width, height, widget, RADIUS_EXTERNAL, round);
+
drawBevelGradient(cr, style, area, region, x, y, width, height, base, horiz,
sunken && !IS_TROUGH(widget), app, widget);
@@ -2118,10 +2130,12 @@
{
bool useWindow=isWindow || (opts.bgndImage.type==opts.menuBgndImage.type &&
(IMG_FILE!=opts.bgndImage.type ||
- (opts.bgndImage.height==opts.bgndImage.height &&
- opts.bgndImage.width==opts.bgndImage.width &&
+ (opts.bgndImage.height==opts.menuBgndImage.height &&
+ opts.bgndImage.width==opts.menuBgndImage.width &&
opts.bgndImage.file==opts.menuBgndImage.file)));
QtCImage *img=useWindow ? &opts.bgndImage : &opts.menuBgndImage;
+ int imgWidth=IMG_FILE==img->type ? img->width : QTC_RINGS_WIDTH(img->type),
+ imgHeight=IMG_FILE==img->type ? img->height : QTC_RINGS_HEIGHT(img->type);
switch(img->type)
{
@@ -2143,7 +2157,7 @@
if(!crImg)
{
cairo_t *ci;
- crImg=cairo_image_surface_create(CAIRO_FORMAT_ARGB32, QTC_RINGS_WIDTH+1, QTC_RINGS_HEIGHT+1);
+ crImg=cairo_image_surface_create(CAIRO_FORMAT_ARGB32, imgWidth+1, imgHeight+1);
ci=cairo_create(crImg);
drawBgndRing(ci, 0, 0, 200, 140, isWindow);
@@ -2163,8 +2177,56 @@
menuBgndImage=crImg;
}
- cairo_set_source_surface(cr, crImg, width-QTC_RINGS_WIDTH, y+1);
+ cairo_set_source_surface(cr, crImg, width-imgWidth, y+1);
cairo_paint(cr);
+ break;
+ }
+ case IMG_SQUARE_RINGS:
+ {
+ cairo_surface_t *crImg=useWindow ? bgndImage : menuBgndImage;
+
+ if(!crImg)
+ {
+ cairo_t *ci;
+ double halfWidth=QTC_RINGS_SQUARE_LINE_WIDTH/2.0;
+ crImg=cairo_image_surface_create(CAIRO_FORMAT_ARGB32, imgWidth+1, imgHeight+1);
+ ci=cairo_create(crImg);
+
+ cairo_set_source_rgba(ci, 1.0, 1.0, 1.0, QTC_RINGS_SQUARE_SMALL_ALPHA);
+ cairo_set_line_width(ci, QTC_RINGS_SQUARE_LINE_WIDTH);
+ createPath(ci, halfWidth+0.5, halfWidth+0.5, QTC_RINGS_SQUARE_SMALL_SIZE, QTC_RINGS_SQUARE_SMALL_SIZE,
+ QTC_RINGS_SQUARE_RADIUS, ROUNDED_ALL);
+ cairo_stroke(ci);
+
+ cairo_new_path(ci);
+ cairo_set_source_rgba(ci, 1.0, 1.0, 1.0, QTC_RINGS_SQUARE_SMALL_ALPHA);
+ cairo_set_line_width(ci, QTC_RINGS_SQUARE_LINE_WIDTH);
+ createPath(ci, halfWidth+0.5+(imgWidth-(QTC_RINGS_SQUARE_SMALL_SIZE+QTC_RINGS_SQUARE_LINE_WIDTH)),
+ halfWidth+0.5+(imgHeight-(QTC_RINGS_SQUARE_SMALL_SIZE+QTC_RINGS_SQUARE_LINE_WIDTH)),
+ QTC_RINGS_SQUARE_SMALL_SIZE, QTC_RINGS_SQUARE_SMALL_SIZE,
+ QTC_RINGS_SQUARE_RADIUS, ROUNDED_ALL);
+ cairo_stroke(ci);
+
+ cairo_new_path(ci);
+ cairo_set_source_rgba(ci, 1.0, 1.0, 1.0, QTC_RINGS_SQUARE_LARGE_ALPHA);
+ cairo_set_line_width(ci, QTC_RINGS_SQUARE_LINE_WIDTH);
+ createPath(ci, halfWidth+0.5+((imgWidth-QTC_RINGS_SQUARE_LARGE_SIZE-QTC_RINGS_SQUARE_LINE_WIDTH)/2.0),
+ halfWidth+0.5+((imgHeight-QTC_RINGS_SQUARE_LARGE_SIZE-QTC_RINGS_SQUARE_LINE_WIDTH)/2.0),
+ QTC_RINGS_SQUARE_LARGE_SIZE, QTC_RINGS_SQUARE_LARGE_SIZE,
+ QTC_RINGS_SQUARE_RADIUS, ROUNDED_ALL);
+ cairo_stroke(ci);
+
+ cairo_destroy(ci);
+
+ if(useWindow)
+ bgndImage=crImg;
+ else
+ menuBgndImage=crImg;
+ }
+
+ cairo_set_source_surface(cr, crImg, width-imgWidth, y+1);
+ cairo_paint(cr);
+ break;
}
}
}
@@ -2481,7 +2543,7 @@
if(opts.glowProgress && (horiz ? width : height)>3)
{
- cairo_pattern_t *pat=cairo_pattern_create_linear(x+1, y+1, horiz ? x+width-4 : 0, horiz ? 0 : y+height-4);
+ cairo_pattern_t *pat=cairo_pattern_create_linear(x+1, y+1, horiz ? x+width-4 : x+1, horiz ? y+1 : y+height-4);
gboolean inverted=FALSE;
if(GLOW_MIDDLE!=opts.glowProgress && widget && GTK_IS_PROGRESS_BAR(widget))
@@ -2598,29 +2660,59 @@
}
}
-static void drawSelectionReal(cairo_t *cr, GtkStyle *style, GtkStateType state, GdkRectangle *area, GtkWidget *widget,
- int x, int y, int width, int height, int round, gboolean isSelection,
- double alpha, GdkColor *col, gboolean horiz)
+static void drawSelectionGradient(cairo_t *cr, GtkStyle *style, GtkStateType state, GdkRectangle *area, GtkWidget *widget,
+ int x, int y, int width, int height, int round, gboolean isLvSelection,
+ double alpha, GdkColor *col, gboolean horiz)
{
- if((!isSelection || !opts.squareLvSelection) && ROUND_NONE!=opts.round)
+ if((!isLvSelection || !opts.squareLvSelection) && ROUND_NONE!=opts.round)
{
- cairo_new_path(cr);
cairo_save(cr);
+ cairo_new_path(cr);
createPath(cr, x, y, width, height, getRadius(&opts, width, height, WIDGET_SELECTION, RADIUS_SELECTION), round);
cairo_clip(cr);
}
drawBevelGradientAlpha(cr, style, area, NULL, x, y, width, height, col,
horiz, FALSE, opts.selectionAppearance, WIDGET_SELECTION, alpha);
- if((!isSelection || !opts.squareLvSelection) && ROUND_NONE!=opts.round)
+ if((!isLvSelection || !opts.squareLvSelection) && ROUND_NONE!=opts.round)
cairo_restore(cr);
}
static void drawSelection(cairo_t *cr, GtkStyle *style, GtkStateType state, GdkRectangle *area, GtkWidget *widget,
- int x, int y, int width, int height, int round, gboolean isSelection)
+ int x, int y, int width, int height, int round, gboolean isLvSelection)
{
- drawSelectionReal(cr, style, state, area, widget, x, y, width, height, round, isSelection,
- GTK_STATE_PRELIGHT==state ? 0.20 : 1.0,
- &style->base[widget && GTK_WIDGET_HAS_FOCUS(widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE], TRUE);
+ double alpha=GTK_STATE_PRELIGHT==state ? 0.20 : 1.0;
+ GdkColor *col=&style->base[GTK_WIDGET_HAS_FOCUS(widget) ? GTK_STATE_SELECTED : GTK_STATE_ACTIVE];
+
+ drawSelectionGradient(cr, style, state, area, widget, x, y, width, height, round, isLvSelection, alpha, col, TRUE);
+
+ if(opts.borderSelection && (!isLvSelection || !opts.squareLvSelection))
+ {
+ double xd=x+0.5,
+ yd=y+0.5,
+ alpha=GTK_STATE_PRELIGHT==state ? 0.20 : 1.0;
+ int xo=x, widtho=width;
+
+ if(isLvSelection && !opts.squareLvSelection && ROUNDED_ALL!=round)
+ {
+ if(!(round&ROUNDED_LEFT))
+ {
+ x-=1;
+ xd-=1;
+ width+=1;
+ }
+ if(!(round&ROUNDED_RIGHT))
+ width+=1;
+ }
+
+ cairo_save(cr);
+ cairo_new_path(cr);
+ cairo_rectangle(cr, xo, y, widtho, height);
+ cairo_clip(cr);
+ cairo_set_source_rgba(cr, QTC_CAIRO_COL(*col), alpha);
+ createPath(cr, xd, yd, width-1, height-1, getRadius(&opts, widtho, height, WIDGET_OTHER, RADIUS_SELECTION), round);
+ cairo_stroke(cr);
+ cairo_restore(cr);
+ }
}
static void gtkDrawSlider(GtkStyle *style, GdkWindow *window, GtkStateType state,
@@ -2775,7 +2867,7 @@
if(GTK_STATE_PRELIGHT==state && opts.splitterHighlight)
{
GdkColor col=shadeColor(&style->bg[state], QTC_TO_FACTOR(opts.splitterHighlight));
- drawSelectionReal(cr, style, state, area, widget, x, y, width, height, ROUNDED_ALL, TRUE, 1.0, &col,
+ drawSelectionGradient(cr, style, state, area, widget, x, y, width, height, ROUNDED_ALL, TRUE, 1.0, &col,
width>height);
}
}
@@ -2784,7 +2876,7 @@
if(GTK_STATE_PRELIGHT==state && opts.crHighlight && width>(QTC_CHECK_SIZE*2))
{
GdkColor col=shadeColor(&style->bg[state], QTC_TO_FACTOR(opts.crHighlight));
- drawSelectionReal(cr, style, state, area, widget, x, y, width, height, ROUNDED_ALL, TRUE, 1.0, &col, TRUE);
+ drawSelectionGradient(cr, style, state, area, widget, x, y, width, height, ROUNDED_ALL, TRUE, 1.0, &col, TRUE);
}
}
else if(detail && 0==strcmp(detail, "expander"))
@@ -2792,7 +2884,7 @@
if(GTK_STATE_PRELIGHT==state && opts.expanderHighlight)
{
GdkColor col=shadeColor(&style->bg[state], QTC_TO_FACTOR(opts.expanderHighlight));
- drawSelectionReal(cr, style, state, area, widget, x, y, width, height, ROUNDED_ALL, TRUE, 1.0, &col, TRUE);
+ drawSelectionGradient(cr, style, state, area, widget, x, y, width, height, ROUNDED_ALL, TRUE, 1.0, &col, TRUE);
}
}
else if(DETAIL("tooltip"))
@@ -3537,12 +3629,7 @@
: combo || optionmenu
? WIDGET_COMBO
: tbar_button
- ?
-#ifdef QTC_DONT_COLOUR_MOUSEOVER_TBAR_BUTTONS
- WIDGET_UNCOLOURED_MO_BUTTON
-#else
- WIDGET_TOOLBAR_BUTTON
-#endif
+ ? (opts.coloredTbarMo ? WIDGET_TOOLBAR_BUTTON : WIDGET_UNCOLOURED_MO_BUTTON)
: togglebutton
? (glowFocus && !sunken ? WIDGET_DEF_BUTTON : WIDGET_TOGGLE_BUTTON)
: checkbox
@@ -3556,12 +3643,10 @@
: WIDGET_OTHER;
int xo=x, yo=y, wo=width, ho=height, stepper=QTC_STEPPER_NONE;
-#ifdef QTC_DONT_COLOUR_MOUSEOVER_TBAR_BUTTONS
/* Try and guess if this button is a toolbar button... */
- if(WIDGET_STD_BUTTON==widgetType && isMozillaWidget(widget) && GTK_IS_BUTTON(widget) && DETAIL("button") &&
- ((width>22 && width<50 && height>30) || height>32))
+ if(!opts.coloredTbarMo && WIDGET_STD_BUTTON==widgetType && isMozillaWidget(widget) &&
+ GTK_IS_BUTTON(widget) && DETAIL("button") && ((width>22 && width<50 && height>30) || height>32))
widgetType=WIDGET_UNCOLOURED_MO_BUTTON;
-#endif
if(ROUND_MAX==opts.round &&
( (WIDGET_TOGGLE_BUTTON==widgetType && height>(QTC_CHECK_SIZE+8) && width<(height+10)) ||
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.0.2/style/window.c new/QtCurve-Gtk2-1.1.1/style/window.c
--- old/QtCurve-Gtk2-1.0.2/style/window.c 2010-01-31 19:34:42.000000000 +0100
+++ new/QtCurve-Gtk2-1.1.1/style/window.c 2010-02-25 21:51:58.000000000 +0100
@@ -38,7 +38,7 @@
GdkRectangle rect;
if(IS_FLAT(opts.bgndAppearance))
- rect.x=0, rect.y=0, rect.width=widget->allocation.width, rect.height=opts.bgndImage.pix ? opts.bgndImage.height : QTC_RINGS_HEIGHT;
+ rect.x=0, rect.y=0, rect.width=widget->allocation.width, rect.height=opts.bgndImage.pix ? opts.bgndImage.height : QTC_RINGS_HEIGHT(opts.bgndImage.type);
else
rect.x=0, rect.y=0, rect.width=widget->allocation.width, rect.height=widget->allocation.height;
gdk_window_invalidate_rect(widget->window, &rect, FALSE);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org