Hello community, here is the log from the commit of package qtcurve-gtk2 for openSUSE:Factory checked in at Sun Sep 26 21:51:03 CEST 2010. -------- --- KDE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-09-18 14:57:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/qtcurve-gtk2/qtcurve-gtk2.changes 2010-09-24 09:56:48.000000000 +0200 @@ -1,0 +2,18 @@ +Fri Sep 24 09:54:04 CEST 2010 - vuntz@opensuse.org + +- Update to version 1.6.2: + + Theme evolution's headers as headers, and not buttons. + + Set fallback icon theme to gnome instead of hicolor. This helps + with some missing icons in evolution. + + If drawing a background image, ensure that this can also be + drawn onto kwin border - if it has a bottom edge. + + Attempt to fix light text on dark background for OpenOffice.org + + Use same radius for all corners of progressbar. + + Apply menu background settings to menus of non-editable combos. + (Rounding is not applied due to clipping/shadow issues with + Gtk2) + + Allow borderless rounded popup menus. + + Don't draw double focus on Gimp combos. + + Allow rounded menus when rounding is set to slight. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- QtCurve-Gtk2-1.6.1.tar.bz2 New: ---- QtCurve-Gtk2-1.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qtcurve-gtk2.spec ++++++ --- /var/tmp/diff_new_pack.VULpqA/_old 2010-09-26 21:47:53.000000000 +0200 +++ /var/tmp/diff_new_pack.VULpqA/_new 2010-09-26 21:47:53.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qtcurve-gtk2 (Version 1.6.1) +# spec file for package qtcurve-gtk2 (Version 1.6.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: qtcurve-gtk2 -Version: 1.6.1 +Version: 1.6.2 Release: 1 License: GPLv2+ Summary: QtCurve style for Gtk2 ++++++ QtCurve-Gtk2-1.6.1.tar.bz2 -> QtCurve-Gtk2-1.6.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/CMakeLists.txt new/QtCurve-Gtk2-1.6.2/CMakeLists.txt --- old/QtCurve-Gtk2-1.6.1/CMakeLists.txt 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/CMakeLists.txt 2010-09-22 21:38:54.000000000 +0200 @@ -8,7 +8,7 @@ set(CPACK_SOURCE_GENERATOR "TBZ2") set(CPACK_PACKAGE_VERSION_MAJOR "1") set(CPACK_PACKAGE_VERSION_MINOR "6") -set(CPACK_PACKAGE_VERSION_PATCH "1") +set(CPACK_PACKAGE_VERSION_PATCH "2") set(CPACK_PACKAGE_CONTACT "Craig Drummond <craig.p.drummond@googlemail.com>") 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.6.1/ChangeLog new/QtCurve-Gtk2-1.6.2/ChangeLog --- old/QtCurve-Gtk2-1.6.1/ChangeLog 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/ChangeLog 2010-09-22 21:38:54.000000000 +0200 @@ -1,3 +1,18 @@ +1.6.2 +----- +1. Theme evolution's headers as headers, and not buttons. +2. Set fallback icon theme to gnome instead of hicolor. This helps with some + missing icons in evolution. +3. If drawing a background image, ensure that this can also be drawn onto kwin + border - if it has a bottom edge. +4. Attempt to fix light text on dark background for OpenOffice.org +5. Use same radius for all corners of progressbar. +6. Apply menu background settings to menus of non-editable combos. (Rounding is + not applied due to clipping/shadow issues with Gtk2) +7. Allow borderless rounded popup menus. +8. Don't draw double focus on Gimp combos. +9. Allow rounded menus when rounding is set to slight. + 1.6.1 ----- 1. Add option to have rounded popup menus. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/common/common.h new/QtCurve-Gtk2-1.6.2/common/common.h --- old/QtCurve-Gtk2-1.6.1/common/common.h 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/common/common.h 2010-09-22 21:38:54.000000000 +0200 @@ -404,6 +404,12 @@ #define RINGS_SQUARE_LARGE_SIZE 120.0 #define RINGS_SQUARE_SMALL_SIZE 100.0 +#if !defined __cplusplus +#define MENU_AND_TOOLTIP_RADIUS (opts.round>=ROUND_FULL ? 5.0 : 3.5) +#else +#define MENU_AND_TOOLTIP_RADIUS (opts.round>=ROUND_FULL ? 5.0 : 2.5) +#endif + #define CUSTOM_BGND (!(IS_FLAT_BGND(opts.bgndAppearance)) || IMG_NONE!=opts.bgndImage.type || 100!=opts.bgndOpacity || 100!=opts.dlgOpacity) #define GLOW_PROG_ALPHA 0.55 @@ -427,7 +433,8 @@ QtC_ToggleButtons, QtC_MenubarColor, QtC_WindowBorder, - QtC_CustomBgnd + QtC_CustomBgnd, + QtC_TitleBarApp } QtCMetrics; #define QtC_StateKWin ((QStyle::StateFlag)0x10000000) @@ -449,7 +456,8 @@ #endif #if defined CONFIG_DIALOG || (defined QT_VERSION && (QT_VERSION >= 0x040000)) -#define QTCURVE_PREVIEW_CONFIG "QTCURVE_PREVIEW_CONFIG" +#define QTCURVE_PREVIEW_CONFIG "QTCURVE_PREVIEW_CONFIG" +#define QTCURVE_PREVIEW_CONFIG_FULL "QTCURVE_PREVIEW_CONFIG_FULL" typedef enum { @@ -501,7 +509,8 @@ NUM_TITLEBAR_BUTTONS } ETitleBarButtons; -#define TBAR_VERSION_HACK 65535 +#define TBAR_VERSION_HACK 65535 +#define TBAR_BORDER_VERSION_HACK (TBAR_VERSION_HACK+1000) typedef std::map<int, QColor> TBCols; #endif @@ -1877,6 +1886,13 @@ return (w>h ? h : w)/2.0; #endif + if(RADIUS_EXTERNAL==rad && !opts->fillProgress && (WIDGET_PROGRESSBAR==widget +#ifndef __cplusplus + || WIDGET_ENTRY_PROGRESSBAR==widget +#endif + )) + rad=RADIUS_INTERNAL; + switch(rad) { case RADIUS_SELECTION: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/common/config_file.c new/QtCurve-Gtk2-1.6.2/common/config_file.c --- old/QtCurve-Gtk2-1.6.1/common/config_file.c 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/common/config_file.c 2010-09-22 21:38:54.000000000 +0200 @@ -1365,6 +1365,225 @@ } #endif +static void checkConfig(Options *opts) +{ + /* **Must** check appearance first, as the rest will default to this */ + checkAppearance(&opts->appearance, opts); + checkAppearance(&opts->bgndAppearance, opts); + checkAppearance(&opts->menuBgndAppearance, opts); + checkAppearance(&opts->menubarAppearance, opts); + checkAppearance(&opts->menuitemAppearance, opts); + checkAppearance(&opts->toolbarAppearance, opts); + checkAppearance(&opts->lvAppearance, opts); + checkAppearance(&opts->tabAppearance, opts); + checkAppearance(&opts->activeTabAppearance, opts); + checkAppearance(&opts->sliderAppearance, opts); + checkAppearance(&opts->selectionAppearance, opts); + checkAppearance(&opts->titlebarAppearance, opts); + checkAppearance(&opts->inactiveTitlebarAppearance, opts); +#ifdef __cplusplus + checkAppearance(&opts->titlebarButtonAppearance, opts); + checkAppearance(&opts->selectionAppearance, opts); + checkAppearance(&opts->dwtAppearance, opts); +#endif + checkAppearance(&opts->menuStripeAppearance, opts); + checkAppearance(&opts->progressAppearance, opts); + checkAppearance(&opts->progressGrooveAppearance, opts); + checkAppearance(&opts->grooveAppearance, opts); + checkAppearance(&opts->sunkenAppearance, opts); + checkAppearance(&opts->sbarBgndAppearance, opts); + checkAppearance(&opts->sliderFill, opts); + checkAppearance(&opts->tooltipAppearance, opts); + + if(SHADE_BLEND_SELECTED==opts->shadeCheckRadio) + opts->shadeCheckRadio=SHADE_SELECTED; + + checkColor(&opts->shadeMenubars, &opts->customMenubarsColor); + checkColor(&opts->shadeSliders, &opts->customSlidersColor); + checkColor(&opts->shadeCheckRadio, &opts->customCheckRadioColor); + checkColor(&opts->menuStripe, &opts->customMenuStripeColor); + checkColor(&opts->comboBtn, &opts->customComboBtnColor); + checkColor(&opts->sortedLv, &opts->customSortedLvColor); + if(APPEARANCE_BEVELLED==opts->toolbarAppearance) + opts->toolbarAppearance=APPEARANCE_GRADIENT; + else if(APPEARANCE_RAISED==opts->toolbarAppearance) + opts->toolbarAppearance=APPEARANCE_FLAT; + + if(APPEARANCE_BEVELLED==opts->menubarAppearance) + opts->menubarAppearance=APPEARANCE_GRADIENT; + else if(APPEARANCE_RAISED==opts->menubarAppearance) + opts->menubarAppearance=APPEARANCE_FLAT; + + if(APPEARANCE_BEVELLED==opts->sliderAppearance) + opts->sliderAppearance=APPEARANCE_GRADIENT; + + if(APPEARANCE_BEVELLED==opts->tabAppearance) + opts->tabAppearance=APPEARANCE_GRADIENT; + + if(APPEARANCE_BEVELLED==opts->activeTabAppearance) + opts->activeTabAppearance=APPEARANCE_GRADIENT; + + if(APPEARANCE_RAISED==opts->selectionAppearance) + opts->selectionAppearance=APPEARANCE_FLAT; + else if(APPEARANCE_BEVELLED==opts->selectionAppearance) + opts->selectionAppearance=APPEARANCE_GRADIENT; + + if(APPEARANCE_RAISED==opts->menuStripeAppearance) + opts->menuStripeAppearance=APPEARANCE_FLAT; + else if(APPEARANCE_BEVELLED==opts->menuStripeAppearance) + opts->menuStripeAppearance=APPEARANCE_GRADIENT; + + if(opts->highlightFactor<MIN_HIGHLIGHT_FACTOR || opts->highlightFactor>MAX_HIGHLIGHT_FACTOR) + opts->highlightFactor=DEFAULT_HIGHLIGHT_FACTOR; + + if(opts->crHighlight<MIN_HIGHLIGHT_FACTOR || opts->crHighlight>MAX_HIGHLIGHT_FACTOR) + opts->crHighlight=DEFAULT_CR_HIGHLIGHT_FACTOR; + + if(opts->splitterHighlight<MIN_HIGHLIGHT_FACTOR || opts->splitterHighlight>MAX_HIGHLIGHT_FACTOR) + opts->splitterHighlight=DEFAULT_SPLITTER_HIGHLIGHT_FACTOR; + +#if !defined __cplusplus || defined CONFIG_DIALOG + if(opts->expanderHighlight<MIN_HIGHLIGHT_FACTOR || opts->expanderHighlight>MAX_HIGHLIGHT_FACTOR) + opts->expanderHighlight=DEFAULT_EXPANDER_HIGHLIGHT_FACTOR; +#endif + + if(opts->menuDelay<MIN_MENU_DELAY || opts->menuDelay>MAX_MENU_DELAY) + opts->menuDelay=DEFAULT_MENU_DELAY; + + if(0==opts->sliderWidth%2) + opts->sliderWidth++; + + if(opts->sliderWidth<MIN_SLIDER_WIDTH || opts->sliderWidth>MAX_SLIDER_WIDTH) + opts->sliderWidth=DEFAULT_SLIDER_WIDTH; + + if(opts->sliderWidth<DEFAULT_SLIDER_WIDTH) + opts->sliderThumbs=LINE_NONE; + + if(opts->lighterPopupMenuBgnd<MIN_LIGHTER_POPUP_MENU || opts->lighterPopupMenuBgnd>MAX_LIGHTER_POPUP_MENU) + opts->lighterPopupMenuBgnd=DEF_POPUPMENU_LIGHT_FACTOR; + + if(opts->tabBgnd<MIN_TAB_BGND || opts->tabBgnd>MAX_TAB_BGND) + opts->tabBgnd=DEF_TAB_BGND; + + if(opts->animatedProgress && !opts->stripedProgress) + opts->animatedProgress=false; + + if(0==opts->gbFactor) + opts->groupBox=FRAME_PLAIN; + + if(opts->gbFactor<MIN_GB_FACTOR || opts->gbFactor>MAX_GB_FACTOR) + opts->gbFactor=DEF_GB_FACTOR; + +#if defined __cplusplus && defined QT_VERSION && QT_VERSION < 0x040000 && !defined CONFIG_DIALOG + opts->crSize=CR_SMALL_SIZE; + if(SLIDER_CIRCULAR==opts->sliderStyle) + opts->sliderStyle=SLIDER_ROUND; + if(STRIPE_FADE==opts->stripedProgress) + opts->stripedProgress=STRIPE_PLAIN; +#endif + /* For now, only 2 sizes... */ + if(opts->crSize!=CR_SMALL_SIZE && opts->crSize!=CR_LARGE_SIZE) + opts->crSize=CR_SMALL_SIZE; + +/* +?? + if(SHADE_CUSTOM==opts->shadeMenubars || SHADE_BLEND_SELECTED==opts->shadeMenubars || !opts->borderMenuitems) + opts->colorMenubarMouseOver=true; +*/ + +#if defined __cplusplus && defined QT_VERSION && QT_VERSION < 0x040000 && !defined CONFIG_DIALOG + if(opts->round>ROUND_FULL) + opts->round=ROUND_FULL; +#endif +#ifndef CONFIG_DIALOG + if(MO_GLOW==opts->coloredMouseOver && EFFECT_NONE==opts->buttonEffect) + opts->coloredMouseOver=MO_COLORED_THICK; + + if(IND_GLOW==opts->defBtnIndicator && EFFECT_NONE==opts->buttonEffect) + opts->defBtnIndicator=IND_TINT; + + if(opts->round>ROUND_EXTRA && FOCUS_GLOW!=opts->focus) + opts->focus=FOCUS_LINE; + + if(EFFECT_NONE==opts->buttonEffect) + { + opts->etchEntry=false; + if(FOCUS_GLOW==opts->focus) + opts->focus=FOCUS_FULL; + } + +// if(opts->squareScrollViews) +// opts->highlightScrollViews=false; + + if(SHADE_WINDOW_BORDER==opts->shadeMenubars) + opts->shadeMenubarOnlyWhenActive=true; + + if(MO_GLOW==opts->coloredMouseOver) + opts->coloredTbarMo=true; + + if(opts->round<ROUND_SLIGHT) + opts->square|=SQUARE_POPUP_MENUS|SQUARE_TOOLTIPS; +#endif + + if(opts->bgndOpacity<0 || opts->bgndOpacity>100) + opts->bgndOpacity=100; + if(opts->dlgOpacity<0 || opts->dlgOpacity>100) + opts->dlgOpacity=100; + if(opts->menuBgndOpacity<0 || opts->menuBgndOpacity>100) + opts->menuBgndOpacity=100; + +#ifndef CONFIG_DIALOG + opts->bgndAppearance=MODIFY_AGUA(opts->bgndAppearance); + opts->selectionAppearance=MODIFY_AGUA(opts->selectionAppearance); + opts->lvAppearance=MODIFY_AGUA_X(opts->lvAppearance, APPEARANCE_LV_AGUA); + opts->sbarBgndAppearance=MODIFY_AGUA(opts->sbarBgndAppearance); + opts->tooltipAppearance=MODIFY_AGUA(opts->tooltipAppearance); + opts->progressGrooveAppearance=MODIFY_AGUA(opts->progressGrooveAppearance); + opts->menuBgndAppearance=MODIFY_AGUA(opts->menuBgndAppearance); + opts->menuStripeAppearance=MODIFY_AGUA(opts->menuStripeAppearance); + opts->grooveAppearance=MODIFY_AGUA(opts->grooveAppearance); + opts->progressAppearance=MODIFY_AGUA(opts->progressAppearance); + opts->sliderFill=MODIFY_AGUA(opts->sliderFill); + opts->tabAppearance=MODIFY_AGUA(opts->tabAppearance); + opts->activeTabAppearance=MODIFY_AGUA(opts->activeTabAppearance); + opts->menuitemAppearance=MODIFY_AGUA(opts->menuitemAppearance); + + if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&SQUARE_PROGRESS))) + opts->borderProgress=true; + + opts->titlebarAppearance=MODIFY_AGUA(opts->titlebarAppearance); + opts->inactiveTitlebarAppearance=MODIFY_AGUA(opts->inactiveTitlebarAppearance); + + if(opts->shadePopupMenu && SHADE_NONE==opts->shadeMenubars) + opts->shadePopupMenu=false; + + if(opts->shadePopupMenu) + opts->lighterPopupMenuBgnd=0; +#ifdef __cplusplus + +#if defined QT_VERSION && QT_VERSION >= 0x040000 + if(!(opts->titlebarButtons&TITLEBAR_BUTTON_ROUND)) +#endif + opts->titlebarButtonAppearance=MODIFY_AGUA(opts->titlebarButtonAppearance); + opts->dwtAppearance=MODIFY_AGUA(opts->dwtAppearance); +#endif + if(opts->windowBorder&WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR && + (opts->windowBorder&WINDOW_BORDER_BLEND_TITLEBAR || SHADE_WINDOW_BORDER==opts->shadeMenubars)) + opts->windowBorder-=WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR; + + if(APPEARANCE_FLAT==opts->tabAppearance) + opts->tabAppearance=APPEARANCE_RAISED; + if(EFFECT_NONE==opts->buttonEffect) + opts->etchEntry=false; + if(opts->colorSliderMouseOver && + (SHADE_NONE==opts->shadeSliders || SHADE_DARKEN==opts->shadeSliders)) + opts->colorSliderMouseOver=false; +#endif /* ndef CONFIG_DIALOG */ + + if(LINE_1DOT==opts->toolbarSeparators) + opts->toolbarSeparators=LINE_DOTS; +} + #ifdef __cplusplus static bool readConfig(const QString &file, Options *opts, Options *defOpts=0L) #else @@ -2030,165 +2249,8 @@ } #endif - /* **Must** check appearance first, as the rest will default to this */ - checkAppearance(&opts->appearance, opts); - checkAppearance(&opts->bgndAppearance, opts); - checkAppearance(&opts->menuBgndAppearance, opts); - checkAppearance(&opts->menubarAppearance, opts); - checkAppearance(&opts->menuitemAppearance, opts); - checkAppearance(&opts->toolbarAppearance, opts); - checkAppearance(&opts->lvAppearance, opts); - checkAppearance(&opts->tabAppearance, opts); - checkAppearance(&opts->activeTabAppearance, opts); - checkAppearance(&opts->sliderAppearance, opts); - checkAppearance(&opts->selectionAppearance, opts); - checkAppearance(&opts->titlebarAppearance, opts); - checkAppearance(&opts->inactiveTitlebarAppearance, opts); -#ifdef __cplusplus - checkAppearance(&opts->titlebarButtonAppearance, opts); - checkAppearance(&opts->selectionAppearance, opts); - checkAppearance(&opts->dwtAppearance, opts); -#endif - checkAppearance(&opts->menuStripeAppearance, opts); - checkAppearance(&opts->progressAppearance, opts); - checkAppearance(&opts->progressGrooveAppearance, opts); - checkAppearance(&opts->grooveAppearance, opts); - checkAppearance(&opts->sunkenAppearance, opts); - checkAppearance(&opts->sbarBgndAppearance, opts); - checkAppearance(&opts->sliderFill, opts); - checkAppearance(&opts->tooltipAppearance, opts); -#ifndef __cplusplus - releaseConfig(cfg); -#endif - if(SHADE_BLEND_SELECTED==opts->shadeCheckRadio) - opts->shadeCheckRadio=SHADE_SELECTED; - - checkColor(&opts->shadeMenubars, &opts->customMenubarsColor); - checkColor(&opts->shadeSliders, &opts->customSlidersColor); - checkColor(&opts->shadeCheckRadio, &opts->customCheckRadioColor); - checkColor(&opts->menuStripe, &opts->customMenuStripeColor); - checkColor(&opts->comboBtn, &opts->customComboBtnColor); - checkColor(&opts->sortedLv, &opts->customSortedLvColor); - if(APPEARANCE_BEVELLED==opts->toolbarAppearance) - opts->toolbarAppearance=APPEARANCE_GRADIENT; - else if(APPEARANCE_RAISED==opts->toolbarAppearance) - opts->toolbarAppearance=APPEARANCE_FLAT; - - if(APPEARANCE_BEVELLED==opts->menubarAppearance) - opts->menubarAppearance=APPEARANCE_GRADIENT; - else if(APPEARANCE_RAISED==opts->menubarAppearance) - opts->menubarAppearance=APPEARANCE_FLAT; - - if(APPEARANCE_BEVELLED==opts->sliderAppearance) - opts->sliderAppearance=APPEARANCE_GRADIENT; - - if(APPEARANCE_BEVELLED==opts->tabAppearance) - opts->tabAppearance=APPEARANCE_GRADIENT; - - if(APPEARANCE_BEVELLED==opts->activeTabAppearance) - opts->activeTabAppearance=APPEARANCE_GRADIENT; - - if(APPEARANCE_RAISED==opts->selectionAppearance) - opts->selectionAppearance=APPEARANCE_FLAT; - else if(APPEARANCE_BEVELLED==opts->selectionAppearance) - opts->selectionAppearance=APPEARANCE_GRADIENT; - - if(APPEARANCE_RAISED==opts->menuStripeAppearance) - opts->menuStripeAppearance=APPEARANCE_FLAT; - else if(APPEARANCE_BEVELLED==opts->menuStripeAppearance) - opts->menuStripeAppearance=APPEARANCE_GRADIENT; - - if(opts->highlightFactor<MIN_HIGHLIGHT_FACTOR || opts->highlightFactor>MAX_HIGHLIGHT_FACTOR) - opts->highlightFactor=DEFAULT_HIGHLIGHT_FACTOR; - - if(opts->crHighlight<MIN_HIGHLIGHT_FACTOR || opts->crHighlight>MAX_HIGHLIGHT_FACTOR) - opts->crHighlight=DEFAULT_CR_HIGHLIGHT_FACTOR; - - if(opts->splitterHighlight<MIN_HIGHLIGHT_FACTOR || opts->splitterHighlight>MAX_HIGHLIGHT_FACTOR) - opts->splitterHighlight=DEFAULT_SPLITTER_HIGHLIGHT_FACTOR; - -#if !defined __cplusplus || defined CONFIG_DIALOG - if(opts->expanderHighlight<MIN_HIGHLIGHT_FACTOR || opts->expanderHighlight>MAX_HIGHLIGHT_FACTOR) - opts->expanderHighlight=DEFAULT_EXPANDER_HIGHLIGHT_FACTOR; -#endif - - if(opts->menuDelay<MIN_MENU_DELAY || opts->menuDelay>MAX_MENU_DELAY) - opts->menuDelay=DEFAULT_MENU_DELAY; - - if(0==opts->sliderWidth%2) - opts->sliderWidth++; - - if(opts->sliderWidth<MIN_SLIDER_WIDTH || opts->sliderWidth>MAX_SLIDER_WIDTH) - opts->sliderWidth=DEFAULT_SLIDER_WIDTH; - - if(opts->sliderWidth<DEFAULT_SLIDER_WIDTH) - opts->sliderThumbs=LINE_NONE; - - if(opts->lighterPopupMenuBgnd<MIN_LIGHTER_POPUP_MENU || opts->lighterPopupMenuBgnd>MAX_LIGHTER_POPUP_MENU) - opts->lighterPopupMenuBgnd=DEF_POPUPMENU_LIGHT_FACTOR; - - if(opts->tabBgnd<MIN_TAB_BGND || opts->tabBgnd>MAX_TAB_BGND) - opts->tabBgnd=DEF_TAB_BGND; - - if(opts->animatedProgress && !opts->stripedProgress) - opts->animatedProgress=false; - - if(0==opts->gbFactor) - opts->groupBox=FRAME_PLAIN; - - if(opts->gbFactor<MIN_GB_FACTOR || opts->gbFactor>MAX_GB_FACTOR) - opts->gbFactor=DEF_GB_FACTOR; - -#if defined __cplusplus && defined QT_VERSION && QT_VERSION < 0x040000 && !defined CONFIG_DIALOG - opts->crSize=CR_SMALL_SIZE; - if(SLIDER_CIRCULAR==opts->sliderStyle) - opts->sliderStyle=SLIDER_ROUND; - if(STRIPE_FADE==opts->stripedProgress) - opts->stripedProgress=STRIPE_PLAIN; -#endif - /* For now, only 2 sizes... */ - if(opts->crSize!=CR_SMALL_SIZE && opts->crSize!=CR_LARGE_SIZE) - opts->crSize=CR_SMALL_SIZE; - -/* -?? - if(SHADE_CUSTOM==opts->shadeMenubars || SHADE_BLEND_SELECTED==opts->shadeMenubars || !opts->borderMenuitems) - opts->colorMenubarMouseOver=true; -*/ - -#if defined __cplusplus && defined QT_VERSION && QT_VERSION < 0x040000 && !defined CONFIG_DIALOG - if(opts->round>ROUND_FULL) - opts->round=ROUND_FULL; -#endif -#ifndef CONFIG_DIALOG - if(MO_GLOW==opts->coloredMouseOver && EFFECT_NONE==opts->buttonEffect) - opts->coloredMouseOver=MO_COLORED_THICK; - - if(IND_GLOW==opts->defBtnIndicator && EFFECT_NONE==opts->buttonEffect) - opts->defBtnIndicator=IND_TINT; + checkConfig(opts); - if(opts->round>ROUND_EXTRA && FOCUS_GLOW!=opts->focus) - opts->focus=FOCUS_LINE; - - if(EFFECT_NONE==opts->buttonEffect) - { - opts->etchEntry=false; - if(FOCUS_GLOW==opts->focus) - opts->focus=FOCUS_FULL; - } - -// if(opts->squareScrollViews) -// opts->highlightScrollViews=false; - - if(SHADE_WINDOW_BORDER==opts->shadeMenubars) - opts->shadeMenubarOnlyWhenActive=true; - - if(MO_GLOW==opts->coloredMouseOver) - opts->coloredTbarMo=true; - - if(opts->round<ROUND_FULL) - opts->square|=SQUARE_POPUP_MENUS; -#endif #ifndef __cplusplus if(!defOpts) { @@ -2198,70 +2260,7 @@ if(def->customGradient[i]) free(def->customGradient[i]); } -#endif - - if(opts->bgndOpacity<0 || opts->bgndOpacity>100) - opts->bgndOpacity=100; - if(opts->dlgOpacity<0 || opts->dlgOpacity>100) - opts->dlgOpacity=100; - if(opts->menuBgndOpacity<0 || opts->menuBgndOpacity>100) - opts->menuBgndOpacity=100; - - if(!(opts->square&SQUARE_POPUP_MENUS)) - opts->popupBorder=true; - -#ifndef CONFIG_DIALOG - opts->bgndAppearance=MODIFY_AGUA(opts->bgndAppearance); - opts->selectionAppearance=MODIFY_AGUA(opts->selectionAppearance); - opts->lvAppearance=MODIFY_AGUA_X(opts->lvAppearance, APPEARANCE_LV_AGUA); - opts->sbarBgndAppearance=MODIFY_AGUA(opts->sbarBgndAppearance); - opts->tooltipAppearance=MODIFY_AGUA(opts->tooltipAppearance); - opts->progressGrooveAppearance=MODIFY_AGUA(opts->progressGrooveAppearance); - opts->menuBgndAppearance=MODIFY_AGUA(opts->menuBgndAppearance); - opts->menuStripeAppearance=MODIFY_AGUA(opts->menuStripeAppearance); - opts->grooveAppearance=MODIFY_AGUA(opts->grooveAppearance); - opts->progressAppearance=MODIFY_AGUA(opts->progressAppearance); - opts->sliderFill=MODIFY_AGUA(opts->sliderFill); - opts->tabAppearance=MODIFY_AGUA(opts->tabAppearance); - opts->activeTabAppearance=MODIFY_AGUA(opts->activeTabAppearance); - opts->menuitemAppearance=MODIFY_AGUA(opts->menuitemAppearance); - - if(!opts->borderProgress && (!opts->fillProgress || !(opts->square&SQUARE_PROGRESS))) - opts->borderProgress=true; - - opts->titlebarAppearance=MODIFY_AGUA(opts->titlebarAppearance); - opts->inactiveTitlebarAppearance=MODIFY_AGUA(opts->inactiveTitlebarAppearance); - - if(opts->shadePopupMenu && SHADE_NONE==opts->shadeMenubars) - opts->shadePopupMenu=false; - - if(opts->shadePopupMenu) - opts->lighterPopupMenuBgnd=0; -#ifdef __cplusplus - -#if defined QT_VERSION && QT_VERSION >= 0x040000 - if(!(opts->titlebarButtons&TITLEBAR_BUTTON_ROUND)) -#endif - opts->titlebarButtonAppearance=MODIFY_AGUA(opts->titlebarButtonAppearance); - opts->dwtAppearance=MODIFY_AGUA(opts->dwtAppearance); -#endif - if(opts->windowBorder&WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR && - (opts->windowBorder&WINDOW_BORDER_BLEND_TITLEBAR || SHADE_WINDOW_BORDER==opts->shadeMenubars)) - opts->windowBorder-=WINDOW_BORDER_USE_MENUBAR_COLOR_FOR_TITLEBAR; - - if(APPEARANCE_FLAT==opts->tabAppearance) - opts->tabAppearance=APPEARANCE_RAISED; - if(EFFECT_NONE==opts->buttonEffect) - opts->etchEntry=false; - if(opts->colorSliderMouseOver && - (SHADE_NONE==opts->shadeSliders || SHADE_DARKEN==opts->shadeSliders)) - opts->colorSliderMouseOver=false; -#endif /* ndef CONFIG_DIALOG */ - - if(LINE_1DOT==opts->toolbarSeparators) - opts->toolbarSeparators=LINE_DOTS; - -#ifndef __cplusplus + releaseConfig(cfg); freeOpts(defOpts); #endif return true; @@ -3127,6 +3126,7 @@ CFG_WRITE_APPEARANCE_ENTRY(grooveAppearance, APP_ALLOW_BASIC) CFG_WRITE_APPEARANCE_ENTRY(sunkenAppearance, APP_ALLOW_BASIC) CFG_WRITE_APPEARANCE_ENTRY(sbarBgndAppearance, APP_ALLOW_BASIC) + CFG_WRITE_APPEARANCE_ENTRY(tooltipAppearance, APP_ALLOW_BASIC) CFG_WRITE_ENTRY(sliderFill) CFG_WRITE_ENTRY(progressGrooveColor) CFG_WRITE_ENTRY(focus) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/style/gtkrc new/QtCurve-Gtk2-1.6.2/style/gtkrc --- old/QtCurve-Gtk2-1.6.1/style/gtkrc 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/style/gtkrc 2010-09-22 21:38:54.000000000 +0200 @@ -1,4 +1,5 @@ gtk-menu-images = 1 +gtk-fallback-icon-theme="gnome" style "qtcurve-default" { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/style/qt_settings.c new/QtCurve-Gtk2-1.6.2/style/qt_settings.c --- old/QtCurve-Gtk2-1.6.1/style/qt_settings.c 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/style/qt_settings.c 2010-09-22 21:38:54.000000000 +0200 @@ -2404,6 +2404,63 @@ toQtColor(qtSettings.colors[PAL_ACTIVE][COLOR_TEXT_SELECTED].blue)); gtk_rc_parse_string(tmpStr); } + + if(GTK_APP_OPEN_OFFICE==qtSettings.app) + { + GdkColor *active=NULL, + *inactive=NULL; + + if(SHADE_WINDOW_BORDER==opts.shadeMenubars) + { + active=&qtSettings.colors[PAL_ACTIVE][opts.useHighlightForMenu ? COLOR_TEXT_SELECTED : COLOR_WINDOW_BORDER_TEXT]; + inactive=&qtSettings.colors[PAL_ACTIVE][COLOR_WINDOW_BORDER_TEXT]; + } + else if(opts.customMenuTextColor) + { + active=&opts.customMenuSelTextColor; + inactive=&opts.customMenuNormTextColor; + } + else if (SHADE_BLEND_SELECTED==opts.shadeMenubars || SHADE_SELECTED==opts.shadeMenubars || + (SHADE_CUSTOM==opts.shadeMenubars && TOO_DARK(qtcPalette.menubar[ORIGINAL_SHADE]))) + { + active=&qtSettings.colors[PAL_ACTIVE][COLOR_TEXT_SELECTED]; + inactive=&qtSettings.colors[PAL_ACTIVE][COLOR_TEXT_SELECTED]; + } + + if(active && inactive) + { + static const char *format="style \""RC_SETTING"MnuTxt\"" + " {fg[NORMAL]=\"#%02X%02X%02X\"" + " fg[PRELIGHT]=\"#%02X%02X%02X\"" + " fg[ACTIVE]=\"#%02X%02X%02X\"" + " fg[SELECTED]=\"#%02X%02X%02X\"" + " text[NORMAL]=\"#%02X%02X%02X\"}" + " widget_class \"*<GtkMenuBar>*\" style \""RC_SETTING"MnuTxt\" %s"; + static const char *menutitem=" widget_class \"*<GtkMenuItem>*\" style \""RC_SETTING"MnuTxt\" "; + tmpStr=(char *)realloc(tmpStr, strlen(format)+(opts.shadePopupMenu ? strlen(menutitem) : 1)); + + if(tmpStr) + { + sprintf(tmpStr, format, toQtColor(inactive->red), + toQtColor(inactive->green), + toQtColor(inactive->blue), + toQtColor(active->red), + toQtColor(active->green), + toQtColor(active->blue), + toQtColor(active->red), + toQtColor(active->green), + toQtColor(active->blue), + toQtColor(active->red), + toQtColor(active->green), + toQtColor(active->blue), + toQtColor(inactive->red), + toQtColor(inactive->green), + toQtColor(inactive->blue), + opts.shadePopupMenu ? menutitem : " "); + gtk_rc_parse_string(tmpStr); + } + } + } } // if(qtSettings.inactiveChangeSelectionColor) @@ -2440,7 +2497,7 @@ if(opts.mapKdeIcons && qtSettings.icons) { - static const char *constFormat="gtk-icon-theme-name=\"%s\" gtk-fallback-icon-theme=\"hicolor\""; + static const char *constFormat="gtk-icon-theme-name=\"%s\""; tmpStr=(char *)realloc(tmpStr, strlen(constFormat)+strlen(qtSettings.icons)+1); sprintf(tmpStr, constFormat, qtSettings.icons); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/style/qtcurve.c new/QtCurve-Gtk2-1.6.2/style/qtcurve.c --- old/QtCurve-Gtk2-1.6.1/style/qtcurve.c 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/style/qtcurve.c 2010-09-22 21:38:54.000000000 +0200 @@ -480,9 +480,10 @@ return GTK_APP_EVOLUTION==qtSettings.app && widget && widget->parent && widget->parent->parent && DETAIL("button") && 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget)), "ECanvas") && - (0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "ETree") || - 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "ETable")); - + /*(0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "ETree") || + 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "MessageList") || + 0==strcmp(gtk_type_name(GTK_WIDGET_TYPE(widget->parent)), "ETable")) &&*/ + GTK_IS_SCROLLED_WINDOW(widget->parent->parent); } static gboolean isOnListViewHeader(GtkWidget *w, int level) @@ -934,26 +935,6 @@ } #endif -static int progressbarRound(GtkWidget *widget, gboolean rev) -{ - if(!widget || !GTK_IS_PROGRESS_BAR(widget) || isMozilla() || - equal(gtk_progress_bar_get_fraction(GTK_PROGRESS_BAR(widget)), 100.0)) - return ROUNDED_NONE; - - switch(GTK_PROGRESS_BAR(widget)->orientation) - { - default: - case GTK_PROGRESS_LEFT_TO_RIGHT: - return rev ? ROUNDED_LEFT : ROUNDED_RIGHT; - case GTK_PROGRESS_RIGHT_TO_LEFT: - return rev ? ROUNDED_RIGHT : ROUNDED_LEFT; - case GTK_PROGRESS_BOTTOM_TO_TOP: - return ROUNDED_TOP; - case GTK_PROGRESS_TOP_TO_BOTTOM: - return ROUNDED_BOTTOM; - } -} - static gboolean isFixedWidget(GtkWidget *widget) { return widget && widget->parent && widget->parent->parent && @@ -2576,7 +2557,7 @@ if(useAlpha) cairo_set_operator(cr, CAIRO_OPERATOR_OVER); - drawBgndRings(cr, -ypos, window->allocation.width, TRUE); + drawBgndRings(cr, -ypos, window->allocation.width-1, TRUE); unsetCairoClipping(cr); return TRUE; } @@ -2801,9 +2782,8 @@ : qtcPalette.progress ? qtcPalette.progress : qtcPalette.highlight; - int round=opts.fillProgress || isEntryProg ? ROUNDED_ALL : progressbarRound(widget, rev), - new_state=GTK_STATE_PRELIGHT==state ? GTK_STATE_NORMAL : state; - int fillVal=grayItem ? 4 : ORIGINAL_SHADE, + int new_state=GTK_STATE_PRELIGHT==state ? GTK_STATE_NORMAL : state, + fillVal=grayItem ? 4 : ORIGINAL_SHADE, borderVal=0; x++, y++, width-=2, height-=2; @@ -2814,7 +2794,7 @@ if((horiz ? width : height)>1) drawLightBevel(cr, style, new_state, area, NULL, x, y, width, height, &itemCols[fillVal], - itemCols, round, wid, BORDER_FLAT, + itemCols, ROUNDED_ALL, wid, BORDER_FLAT, (horiz ? 0 : DF_VERT)|DF_DO_CORNERS, widget); if(opts.stripedProgress && width>4 && height>4) @@ -2828,7 +2808,7 @@ else drawLightBevel(cr, style, new_state, NULL, region, x, y, width, height, &itemCols[1], - qtcPalette.highlight, round, wid, BORDER_FLAT, + qtcPalette.highlight, ROUNDED_ALL, wid, BORDER_FLAT, (opts.fillProgress || !opts.borderProgress ? 0 : DF_DO_BORDER)|(horiz ? 0 : DF_VERT)|DF_DO_CORNERS, widget); if(opts.glowProgress && (horiz ? width : height)>3) @@ -2877,31 +2857,7 @@ if(width>2 && height>2 && opts.borderProgress) realDrawBorder(cr, style, state, area, NULL, x, y, width, height, - itemCols, round, BORDER_FLAT, wid, 0, PBAR_BORDER); - if(!opts.fillProgress && ROUNDED && ROUNDED_ALL!=round && width>4 && height>4 && opts.borderProgress) - { - /*if(!isMozilla()) - { - x--; y--; width+=2; height+=2; - }*/ - cairo_new_path(cr); - if(opts.fillProgress) - { - x++, y++, width-=2, height-=2; - cairo_set_source_rgb(cr, CAIRO_COL(qtcPalette.background[STD_BORDER])); - } - else - cairo_set_source_rgba(cr, CAIRO_COL(qtcPalette.background[ORIGINAL_SHADE]), 0.75); - if(!(round&CORNER_TL)) - cairo_rectangle(cr, x, y, 1, 1); - if(!(round&CORNER_TR)) - cairo_rectangle(cr, x+width-1, y, 1, 1); - if(!(round&CORNER_BR)) - cairo_rectangle(cr, x+width-1, y+height-1, 1, 1); - if(!(round&CORNER_BL)) - cairo_rectangle(cr, x, y+height-1, 1, 1); - cairo_fill(cr); - } + itemCols, ROUNDED_ALL, BORDER_FLAT, wid, 0, PBAR_BORDER); if(!opts.borderProgress) if(horiz) @@ -3230,7 +3186,7 @@ #if GTK_CHECK_VERSION(2,9,0) double radius=0; gboolean nonGtk=isMozilla() || GTK_APP_OPEN_OFFICE==qtSettings.app || GTK_APP_JAVA==qtSettings.app, - rounded=!nonGtk && widget && !(opts.square&SQUARE_TOOLTIPS) && opts.round>=ROUND_FULL; + rounded=!nonGtk && widget && !(opts.square&SQUARE_TOOLTIPS); if(!nonGtk && GTK_IS_WINDOW(widget)) gtk_window_set_opacity(GTK_WINDOW(widget), 0.875); @@ -3240,7 +3196,7 @@ int size=((width&0xFFFF)<<16)+(height&0xFFFF), old=(int)g_object_get_data(G_OBJECT(widget), "QTC_WIDGET_MASK"); - radius=5.0; // getRadius(&opts, width, height, WIDGET_SELECTION, RADIUS_SELECTION); + radius=MENU_AND_TOOLTIP_RADIUS; // getRadius(&opts, width, height, WIDGET_SELECTION, RADIUS_SELECTION); if(size!=old) { @@ -4916,10 +4872,11 @@ } else if(!opts.borderMenuitems && !mb && menuitem) { + /*For now dont round combos - getting weird effects with shadow/clipping :-( */ gboolean roundedMenu=(!widget || !isComboMenu(widget->parent)) && !(opts.square&SQUARE_POPUP_MENUS); if(roundedMenu) - clipPathRadius(cr, x, y, width, height, 4, round); + clipPathRadius(cr, x, y, width, height, MENU_AND_TOOLTIP_RADIUS-1.0, round); drawBevelGradient(cr, style, area, region, x, y, width, height, &itemCols[fillVal], TRUE, FALSE, opts.menuitemAppearance, WIDGET_MENU_ITEM); if(roundedMenu) @@ -4950,15 +4907,16 @@ else if(DETAIL("menu")) { gboolean comboMenu=isComboMenu(widget), - roundedMenu=!comboMenu && !(opts.square&SQUARE_POPUP_MENUS); + roundedMenu=/*!comboMenu &&*/ !(opts.square&SQUARE_POPUP_MENUS); double radius=0.0; - if(roundedMenu) + /*For now dont round combos - getting weird effects with shadow/clipping :-( */ + if(roundedMenu && !comboMenu) { int size=((width&0xFFFF)<<16)+(height&0xFFFF), old=(int)g_object_get_data(G_OBJECT(widget), "QTC_WIDGET_MASK"); - radius=5; // getRadius(&opts, width, height, WIDGET_SELECTION, RADIUS_SELECTION); + radius=MENU_AND_TOOLTIP_RADIUS; // getRadius(&opts, width, height, WIDGET_SELECTION, RADIUS_SELECTION); if(size!=old) { GdkBitmap *mask=gdk_pixmap_new(NULL, width, height, 1); @@ -4981,10 +4939,10 @@ clipPath(cr, x, y, width, height, WIDGET_OTHER, radius+1, ROUNDED_ALL); } - if(widget && !comboMenu && 100!=opts.menuBgndOpacity && !isFixedWidget(widget) && isRgbaWidget(widget)) + if(widget && /*!comboMenu && */100!=opts.menuBgndOpacity && !isFixedWidget(widget) && isRgbaWidget(widget)) enableBlurBehind(widget, TRUE); - if(!comboMenu && !IS_FLAT_BGND(opts.menuBgndAppearance)) + if(/*!comboMenu && */!IS_FLAT_BGND(opts.menuBgndAppearance)) { double alpha=1.0; gboolean useAlpha=opts.menuBgndOpacity<100 && isRgbaWidget(widget) && compositingActive(widget); @@ -5006,7 +4964,7 @@ else if(opts.shadePopupMenu || USE_LIGHTER_POPUP_MENU) { double alpha=1.0; - gboolean useAlpha=!comboMenu && opts.menuBgndOpacity<100 && isRgbaWidget(widget) && compositingActive(widget); + gboolean useAlpha=/*!comboMenu && */opts.menuBgndOpacity<100 && isRgbaWidget(widget) && compositingActive(widget); if(useAlpha) { @@ -5018,7 +4976,7 @@ cairo_set_operator(cr, CAIRO_OPERATOR_OVER); } - if(!comboMenu && IMG_NONE!=opts.menuBgndImage.type) + if(/*!comboMenu && */IMG_NONE!=opts.menuBgndImage.type) drawBgndRings(cr, y, width, FALSE); if(opts.menuStripe && !comboMenu) @@ -5066,17 +5024,18 @@ &opts.customMenuStripeColor, FALSE, FALSE, opts.menuStripeAppearance, WIDGET_OTHER); } - if(opts.popupBorder || roundedMenu) + if(opts.popupBorder) { GdkColor *cols=USE_LIGHTER_POPUP_MENU || opts.shadePopupMenu ? qtcPalette.menu : qtcPalette.background; - if(roundedMenu) + if(roundedMenu && !comboMenu) unsetCairoClipping(cr); cairo_new_path(cr); cairo_set_source_rgb(cr, CAIRO_COL(cols[STD_BORDER])); - if(roundedMenu) + /*For now dont round combos - getting weird effects with shadow/clipping :-( */ + if(roundedMenu && !comboMenu) createPath(cr, x+0.5, y+0.5, width-1, height-1, radius-1, ROUNDED_ALL); else cairo_rectangle(cr, x+0.5, y+0.5, width-1, height-1); @@ -7290,6 +7249,9 @@ } else if(isGimpCombo(widget)) { + if(FOCUS_GLOW==opts.focus) + return; + x-=2, width+=4; if(!doEtch) x--, y--, width+=2, height+=2; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/QtCurve-Gtk2-1.6.1/style/window.c new/QtCurve-Gtk2-1.6.2/style/window.c --- old/QtCurve-Gtk2-1.6.1/style/window.c 2010-09-14 22:26:18.000000000 +0200 +++ new/QtCurve-Gtk2-1.6.2/style/window.c 2010-09-22 21:38:54.000000000 +0200 @@ -266,9 +266,9 @@ gdk_x11_get_xatom_by_name_for_display(display, OPACITY_ATOM), XA_CARDINAL, 16, PropModeReplace, (unsigned char *)&opacity, 1); - if(!IS_FLAT_BGND(opts.bgndAppearance)) + if(!IS_FLAT_BGND(opts.bgndAppearance) || IMG_NONE!=opts.bgndImage.type) { - unsigned short app=opts.bgndAppearance; + unsigned short app=IS_FLAT_BGND(opts.bgndAppearance) ? APPEARANCE_RAISED : opts.bgndAppearance; XChangeProperty(GDK_DISPLAY_XDISPLAY(display), GDK_WINDOW_XID(GTK_WIDGET(topLevel)->window), gdk_x11_get_xatom_by_name_for_display(display, BGND_ATOM), XA_CARDINAL, 16, PropModeReplace, (unsigned char *)&app, 1); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org