@@ -7,18 +7,37 @@ frame, inactiveFrame : Window frame (was fixed to general KDE bg in KWM). handle, inactiveHandle : Window handles (sometimes called "grips"). activeBackground, inactiveBackground : Tilebars (bad name, but it's what KWM -uses). +uses). This is for styles that use a solid filled rectangle for the titlebar +such as the standard style and KStep. -activeBlend, inactiveBlend : Titlebar blend. +activeGroove, inactiveGroove: This is for titlebars that instead of a solid +rectangle use some sort of groove or small bevels layered on the frame. +An example of this is System. -activeForeground, inactiveForeground : Tilebar text. +activeBlend, inactiveBlend : Titlebar blend for styles that use a rectangle +titlebar fill. + +activeForeground, inactiveForeground : Tilebar text for styles that use a +rectangle titlebar fill. + +activeGrooveText, inactiveGrooveText: Titlebar text for styles that use +grooved titlebar styles instead of the solid fill. This should contrast with +the frame color. activeTitleBtnBg, inactiveTitleButtonBg : Button background color for up and down states. activeTitleBtnBlend, inactiveTitleBtnBlend : Button blend. -activeTitleBtnFg, activeTitleBtnFg : Button foreground color. +activeTitleBtnFg, activeTitleBtnFg : Some style's buttons don't use the +above button background colors but instead draw the button foreground +transparently on the frame. The best example of this is the standard KDE +style. Use this to specify a color for such styles, which should contrast with +the frame - not the button bg. + +activeTitleBtnFullFg, inactiveTitleBtnFullFg: This is for styles that have +full support for button background settings. Examples are KStep and System. +This should contrast with the button background. Daniel M. Duley mosfet@kde.org NEWCOLORSCHEME.README @@ -1 +1 @@ -SUBDIRS=be kstep system kwmtheme +SUBDIRS=advkde be kstep system kwmtheme clients/Makefile.am @@ -89,7 +89,21 @@ static void create_pixmaps() options->color(Options::Handle, false).light(150), options->color(Options::Handle, false).dark(120), KPixmapEffect::VerticalGradient); +} +void NextClient::slotReset() +{ + delete aTitlePix; + delete iTitlePix; + delete aFramePix; + delete iFramePix; + delete aHandlePix; + delete iHandlePix; + pixmaps_created = false; + create_pixmaps(); + button[0]->reset(); + button[1]->reset(); + button[2]->reset(); } NextButton::NextButton(QWidget *parent, const char *name, @@ -100,6 +114,16 @@ NextButton::NextButton(QWidget *parent, const char *name, aBackground.resize(18, 18); iBackground.resize(18, 18); + reset(); + resize(18, 18); + + if(bitmap) + setBitmap(bitmap, bw, bh); +} + +void NextButton::reset() +{ + QPainter p; QColor hColor(options->color(Options::ButtonBg, true)); QColor lColor(options->color(Options::ButtonBlend, true)); @@ -144,11 +168,6 @@ NextButton::NextButton(QWidget *parent, const char *name, p.setPen(Qt::black); p.drawRect(0, 0, 18, 18); p.end(); - - resize(18, 18); - - if(bitmap) - setBitmap(bitmap, bw, bh); } void NextButton::setBitmap(const unsigned char *bitmap, int w, int h) @@ -174,6 +193,8 @@ NextClient::NextClient( Workspace *ws, WId w, QWidget *parent, : Client( ws, w, parent, name, WResizeNoErase ) { create_pixmaps(); + connect(options, SIGNAL(resetClients()), this, SLOT(slotReset())); + QVBoxLayout *mainLayout = new QVBoxLayout(this); QHBoxLayout *titleLayout = new QHBoxLayout(); QHBoxLayout *windowLayout = new QHBoxLayout(); clients/kstep/nextclient.cpp @@ -16,6 +16,7 @@ public: NextButton(QWidget *parent=0, const char *name=0, const unsigned char *bitmap=NULL, int bw=0, int bh=0); void setBitmap(const unsigned char *bitmap, int bw, int bh); + void reset(); protected: virtual void drawButton(QPainter *p); void drawButtonLabel(QPainter *){;} @@ -37,6 +38,8 @@ protected: void init(); void captionChange( const QString& name ); void stickyChange(bool on); +protected slots: + void slotReset(); private: NextButton* button[3]; QSpacerItem* titlebar; clients/kstep/nextclient.h @@ -66,10 +66,10 @@ static void create_pixmaps() maskPainter.begin(&mask); maskPainter.setPen(Qt::color1); for(i=0, y=2; i < 4; ++i, y+=3){ - p.setPen(options->color(Options::TitleBar, true).light(150)); + p.setPen(options->color(Options::Groove, true).light(150)); p.drawLine(0, y, 31, y); maskPainter.drawLine(0, y, 31, y); - p.setPen(options->color(Options::TitleBar, true).dark(120)); + p.setPen(options->color(Options::Groove, true).dark(120)); p.drawLine(0, y+1, 31, y+1); maskPainter.drawLine(0, y+1, 31, y+1); } @@ -100,29 +100,29 @@ SystemButton::SystemButton(QWidget *parent, const char *name, const unsigned char *bitmap) : QButton(parent, name) { - QPainter p; - aBackground.resize(14, 14); iBackground.resize(14, 14); + reset(); + resize(14, 14); + + if(bitmap) + setBitmap(bitmap); +} +void SystemButton::reset() +{ + QPainter p; QColor hColor(options->color(Options::ButtonBg, true)); QColor lColor(options->color(Options::ButtonBlend, true)); - // only do this if we can dim/brighten equally - if(hColor.red() < 226 && hColor.green() < 226 && hColor.blue() < 226) - hColor.setRgb(hColor.red()+30, hColor.green()+30, hColor.blue()+30); - if(lColor.red() > 29 && lColor.green() > 29 && lColor.blue() > 29) - lColor.setRgb(lColor.red()-30, lColor.green()-30, lColor.blue()-30); - KPixmapEffect::gradient(iBackground, hColor, lColor, + + KPixmapEffect::gradient(aBackground, hColor.light(150), lColor.dark(150), KPixmapEffect::DiagonalGradient); - hColor = options->color(Options::ButtonBlend, false); - lColor = options->color(Options::ButtonBg, false); - if(hColor.red() > 29 && hColor.green() > 29 && hColor.blue() > 29) - hColor.setRgb(hColor.red()-30, hColor.green()-30, hColor.blue()-30); - if(lColor.red() < 226 && lColor.green() < 226 && lColor.blue() < 226) - lColor.setRgb(lColor.red()+30, lColor.green()+30, lColor.blue()+30); - KPixmapEffect::gradient(aBackground, hColor, lColor, + hColor = (options->color(Options::ButtonBg, false)); + lColor = (options->color(Options::ButtonBlend, false)); + KPixmapEffect::gradient(iBackground, hColor.light(150), lColor.dark(150), KPixmapEffect::DiagonalGradient); + KPixmap aInternal; aInternal.resize(10, 10); @@ -139,10 +139,10 @@ SystemButton::SystemButton(QWidget *parent, const char *name, p.begin(&iBackground); p.drawPixmap(2, 2, iInternal); - p.setPen(options->color(Options::ButtonBg, false)); + p.setPen(options->color(Options::ButtonBg, false).light(120)); p.drawLine(0, 13, 13, 13); p.drawLine(13, 0, 13, 13); - p.setPen(options->color(Options::ButtonBlend, false)); + p.setPen(options->color(Options::ButtonBlend, false).dark(120)); p.drawLine(0, 0, 12, 0); p.drawLine(0, 0, 0, 12); p.end(); @@ -153,11 +153,6 @@ SystemButton::SystemButton(QWidget *parent, const char *name, p.drawRect(0, 0, 14, 14); p.end(); - - resize(14, 14); - - if(bitmap) - setBitmap(bitmap); } void SystemButton::setBitmap(const unsigned char *bitmap) @@ -178,11 +173,29 @@ void SystemButton::drawButton(QPainter *p) p->drawPixmap(isDown() ? 4 : 3, isDown() ? 4 : 3, deco); } +void SystemClient::slotReset() +{ + delete titlePix; + if(aUpperGradient){ + delete aUpperGradient; + delete iUpperGradient; + } + pixmaps_created = false; + create_pixmaps(); + button[0]->reset(); + button[1]->reset(); + button[2]->reset(); + button[3]->reset(); + if(button[4]) + button[4]->reset(); +} + SystemClient::SystemClient( Workspace *ws, WId w, QWidget *parent, const char *name ) : Client( ws, w, parent, name, WResizeNoErase ) { create_pixmaps(); + connect(options, SIGNAL(resetClients()), this, SLOT(slotReset())); bool help = providesContextHelp(); QGridLayout* g = new QGridLayout(this, 0, 0, 2); @@ -206,6 +219,8 @@ SystemClient::SystemClient( Workspace *ws, WId w, QWidget *parent, button[4] = new SystemButton(this, "help", question_bits); connect( button[4], SIGNAL( clicked() ), this, ( SLOT( contextHelp() ) ) ); } + else + button[4] = NULL; connect( button[0], SIGNAL( clicked() ), this, ( SLOT( closeWindow() ) ) ); connect( button[1], SIGNAL( clicked() ), this, ( SLOT( toggleSticky() ) ) ); @@ -262,34 +277,6 @@ void SystemClient::drawRoundFrame(QPainter &p, int x, int y, int w, int h) kDrawRoundButton(&p, x, y, w, h, options->colorGroup(Options::Frame, isActive()), false); - /* - int x2=x+w-1, y2=y+h-1; - QPointArray hPntArray, lPntArray; - hPntArray.putPoints(0, 12, x+4,y+1, x+5,y+1, // top left - x+3,y+2, x+2,y+3, x+1,y+4, x+1,y+5, - x+1,y2-5, x+1,y2-4, x+2,y2-3, // half corners - x2-5,y+1, x2-4,y+1, x2-3,y+2); - - lPntArray.putPoints(0, 17, x2-5,y2-1, x2-4,y2-1, // btm right - x2-3,y2-2, x2-2,y2-3, x2-1,y2-5, x2-1,y2-4, - - x+3,y2-2, x+4,y2-1, x+5,y2-1, //half corners - x2-2,y+3, x2-1,y+4, x2-1,y+5, - - x2-5,y2-2, x2-4,y2-2, // testing - x2-3,y2-3, - x2-2,y2-5, x2-2,y2-4); - - p.setPen(options->colorGroup(Options::Frame, isActive()).light()); - p.drawLine(x+6, y, x2-6, y); - p.drawLine(0, y+6, 0, y2-6); - p.drawPoints(hPntArray); - p.setPen(options->colorGroup(Options::Frame, isActive()).dark()); - p.drawLine(x+6, y2, x2-6, y2); - p.drawLine(x+6, y2-1, x2-6, y2-1); - p.drawLine(x2, y+6, x2, y2-6); - p.drawLine(x2-1, y+6, x2-1, y2-6); - p.drawPoints(lPntArray); */ } void SystemClient::paintEvent( QPaintEvent* ) @@ -325,7 +312,7 @@ void SystemClient::paintEvent( QPaintEvent* ) t.setLeft( t.left() + 4 ); t.setRight( t.right() - 2 ); - p.setPen(options->color(Options::Font, isActive())); + p.setPen(options->color(Options::GrooveText, isActive())); p.setFont(options->font(isActive())); if(isActive()){ QFontMetrics fm(options->font(true)); clients/system/systemclient.cpp @@ -16,6 +16,7 @@ public: SystemButton(QWidget *parent=0, const char *name=0, const unsigned char *bitmap=NULL); void setBitmap(const unsigned char *bitmap); + void reset(); protected: virtual void drawButton(QPainter *p); void drawButtonLabel(QPainter *){;} @@ -41,6 +42,8 @@ protected: void stickyChange(bool on); void maximizeChange(bool m); void doShape(); +protected slots: + void slotReset(); private: SystemButton* button[5]; QSpacerItem* titlebar; clients/system/systemclient.h @@ -59,60 +59,106 @@ void Options::reload() colors[Frame] = config->readColorEntry("frame", &colors[Frame]); colors[Handle] = QColor( 140, 140, 140 ); colors[Handle] = config->readColorEntry("handle", &colors[Handle]); - colors[ButtonBg] = colors[Frame]; + + colors[Groove] = colors[Frame]; + colors[Groove] = config->readColorEntry("activeGroove", + &colors[Groove]); + + if(qGray(colors[Frame].rgb()) > 150) + colors[GrooveText] = Qt::black; + else + colors[GrooveText] = Qt::white; + colors[GrooveText] = config->readColorEntry("activeGrooveText", + &colors[GrooveText]); + + // full button configuration (background, blend, and foreground + if(QPixmap::defaultDepth() > 8) + colors[ButtonBg] = colors[Frame].light(130); + else + colors[ButtonBg] = colors[Frame]; colors[ButtonBg] = config->readColorEntry("activeTitleBtnBg", &colors[Frame]); - if(QPixmap::defaultDepth() < 9) - colors[ButtonBlend] = colors[ ButtonBg ]; + if(QPixmap::defaultDepth() > 8) + colors[ButtonBlend] = colors[Frame].dark(130); else - colors[ButtonBlend] = colors[ ButtonBg ].dark(110); + colors[ButtonBlend] = colors[Frame]; colors[ButtonBlend] = config->readColorEntry("activeTitleBtnBlend", &colors[ButtonBlend]); + if(qGray(colors[ButtonBg].rgb()) > 150 || + qGray(colors[ButtonBlend].rgb()) > 150) + colors[ButtonFg] = Qt::black; + else + colors[ButtonFg] = Qt::white; + colors[ButtonFg] = config->readColorEntry("activeTitleBtnFullFg", + &colors[ButtonFg]); + + // single color button configuration + colors[ButtonSingleColor] = Qt::darkGray; + colors[ButtonSingleColor] = + config->readColorEntry("activeTitleBtnFg", &colors[ButtonSingleColor]); + colors[TitleBar] = pal.normal().highlight(); colors[TitleBar] = config->readColorEntry("activeBackground", &colors[TitleBar]); - if(QPixmap::defaultDepth() < 9) - colors[TitleBlend] = colors[ TitleBar ]; - else + if(QPixmap::defaultDepth() > 8) colors[TitleBlend] = colors[ TitleBar ].dark(110); + else + colors[TitleBlend] = colors[ TitleBar ]; colors[TitleBlend] = config->readColorEntry("activeBlend", &colors[TitleBlend]); colors[Font] = pal.normal().highlightedText(); colors[Font] = config->readColorEntry("activeForeground", &colors[Font]); - colors[ButtonFg] = Qt::darkGray; - colors[ButtonFg] = config->readColorEntry("activeTitleBtnFg", - &colors[ButtonFg]); // inactive colors[Frame+KWINCOLORS] = config->readColorEntry("inactiveFrame", &colors[Frame]); + colors[Groove+KWINCOLORS] = + config->readColorEntry("inactiveGroove", &colors[Frame+KWINCOLORS]); + + if(qGray(colors[Frame+KWINCOLORS].rgb()) > 150) + colors[GrooveText+KWINCOLORS] = Qt::darkGray; + else + colors[GrooveText+KWINCOLORS] = Qt::lightGray; + colors[GrooveText+KWINCOLORS] = + config->readColorEntry("inactiveGrooveText", + &colors[GrooveText+KWINCOLORS]); + colors[TitleBar+KWINCOLORS] = colors[Frame]; colors[TitleBar+KWINCOLORS] = config-> readColorEntry("inactiveBackground", &colors[TitleBar+KWINCOLORS]); - if(QPixmap::defaultDepth() < 9) - colors[TitleBlend+KWINCOLORS] = colors[ TitleBar+KWINCOLORS ]; - else + if(QPixmap::defaultDepth() > 8) colors[TitleBlend+KWINCOLORS] = colors[ TitleBar+KWINCOLORS ].dark(110); + else + colors[TitleBlend+KWINCOLORS] = colors[ TitleBar+KWINCOLORS ]; colors[TitleBlend+KWINCOLORS] = config->readColorEntry("inactiveBlend", &colors[TitleBlend+KWINCOLORS]); - colors[ButtonBg+KWINCOLORS] = colors[Frame+KWINCOLORS]; + // full button configuration + if(QPixmap::defaultDepth() > 8) + colors[ButtonBg+KWINCOLORS] = colors[Frame+KWINCOLORS].light(130); + else + colors[ButtonBg+KWINCOLORS] = colors[Frame+KWINCOLORS]; colors[ButtonBg+KWINCOLORS] = config->readColorEntry("inactiveTitleBtnBg", &colors[ButtonBg]); - if(QPixmap::defaultDepth() < 9) - colors[ButtonBlend+KWINCOLORS] = colors[ ButtonBg+KWINCOLORS ]; + if(QPixmap::defaultDepth() > 8) + colors[ButtonBlend+KWINCOLORS] = colors[ Frame+KWINCOLORS ].dark(130); else - colors[ButtonBlend+KWINCOLORS] = colors[ ButtonBg+KWINCOLORS ].dark(110); + colors[ButtonBlend+KWINCOLORS] = colors[ Frame+KWINCOLORS ]; colors[ButtonBlend+KWINCOLORS] = config->readColorEntry("inactiveTitleBtnBlend", &colors[ButtonBlend+KWINCOLORS]); colors[ButtonFg+KWINCOLORS] = config-> - readColorEntry("inactiveTitleBtnFg", &colors[ButtonFg]); + readColorEntry("inactiveTitleBtnFullFg", &colors[ButtonFg]); + + // single color + colors[ButtonSingleColor+KWINCOLORS] = config-> + readColorEntry("inactiveTitleBtnFg", &colors[ButtonSingleColor]); + colors[Handle+KWINCOLORS] = colors[Frame]; config->readColorEntry("inactiveHandle", &colors[Handle]); @@ -175,7 +221,8 @@ void Options::reload() CmdAll1 = mouseCommand(config->readEntry("CommandAll1","Move")); CmdAll2 = mouseCommand(config->readEntry("CommandAll2","Toggle raise and lower")); CmdAll3 = mouseCommand(config->readEntry("CommandAll3","Resize")); - + + emit resetClients(); } options.cpp @@ -6,7 +6,7 @@ #include <qpalette.h> // increment this when you add a color type (mosfet) -#define KWINCOLORS 8 +#define KWINCOLORS 11 class Options : public QObject { Q_OBJECT @@ -52,7 +52,7 @@ public: */ // increment KWINCOLORS if you add something (mosfet) enum ColorType{TitleBar=0, TitleBlend, Font, ButtonFg, ButtonBg, - ButtonBlend, Frame, Handle}; + ButtonBlend, Frame, Handle, ButtonSingleColor, Groove, GrooveText}; MoveResizeMode resizeMode; MoveResizeMode moveMode; @@ -146,6 +146,9 @@ public: public slots: void reload(); +signals: + void resetClients(); + protected: QFont activeFont, inactiveFont; QColor colors[KWINCOLORS*2]; options.h @@ -45,8 +45,8 @@ static void create_pixmaps() if ( pixmaps_created ) return; pixmaps_created = true; - QColorGroup aGrp = options->colorGroup(Options::ButtonFg, true); - QColorGroup iGrp = options->colorGroup(Options::ButtonFg, false); + QColorGroup aGrp = options->colorGroup(Options::ButtonSingleColor, true); + QColorGroup iGrp = options->colorGroup(Options::ButtonSingleColor, false); QPainter aPainter, iPainter; close_pix = new QPixmap(16, 16); @@ -134,12 +134,45 @@ static void create_pixmaps() question_mark_pix->setMask(QBitmap(16, 16, help_mask_bits, true)); } +void StdClient::slotReset() +{ + warning("In slotReset"); + delete close_pix; + delete maximize_pix; + delete minimize_pix; + delete normalize_pix; + delete pinup_pix; + delete pindown_pix; + delete menu_pix; + delete dis_close_pix; + delete dis_maximize_pix; + delete dis_minimize_pix; + delete dis_normalize_pix; + delete dis_pinup_pix; + delete dis_pindown_pix; + delete dis_menu_pix; + delete question_mark_pix; + pixmaps_created = false; + create_pixmaps(); + + if(miniIcon().isNull()) + button[0]->setIconSet(isActive() ? *menu_pix : *dis_menu_pix); + button[1]->setIconSet(isSticky() ? isActive() ? *pindown_pix : *dis_pindown_pix : + isActive() ? *pinup_pix : *dis_pinup_pix ); + button[3]->setIconSet(isActive() ? *minimize_pix : *dis_minimize_pix); + button[4]->setIconSet(isActive() ? *maximize_pix : *dis_maximize_pix); + button[5]->setIconSet(isActive() ? *close_pix : *dis_close_pix); + if (button[6]) + button[6]->setIconSet( *question_mark_pix ); +} + StdClient::StdClient( Workspace *ws, WId w, QWidget *parent, const char *name ) : Client( ws, w, parent, name, WResizeNoErase ) { create_pixmaps(); - + connect(options, SIGNAL(resetClients()), this, SLOT(slotReset())); + QGridLayout* g = new QGridLayout( this, 0, 0, 2 ); g->setRowStretch( 1, 10 ); g->addWidget( windowWrapper(), 1, 1 ); stdclient.cpp @@ -26,6 +26,7 @@ protected: private slots: void menuButtonPressed(); void maxButtonClicked( int ); + void slotReset(); private: QToolButton* button[7]; stdclient.h 5f1e644f142e6bc443f49cf27f9ac3665ccdf61a Daniel M. Duley daniel.duley@verizon.net http://github.com/Zarin/kwin/commit/1e9765d0a9664e1ac4146b6d09d953acf06e3a3f 1e9765d0a9664e1ac4146b6d09d953acf06e3a3f 2000-01-23T15:33:29-08:00 2000-01-23T15:33:29-08:00 My weekly big ass style commit ;-) This implements what I discussed earlier today. First: All decoration pixmaps are now regenerated when the palette color scheme changes. There is no longer any need to apply color schemes *before* switching styles or reload the plugin. The schemes can change any time and be handled correctly by styles that generate their pixmaps based on the color scheme. Second: The color scheme has been extended to allow separate entries for different visual styles. For example there are now entries for both titlebar rectangle fills like those used in the standard KDE style and KStep vs. titlebar grooves like those used in System. The same thing applies to foreground colors for buttons that follow the button background settings like KStep and System vs. those that don't like the standard style. Right now none of the color schemes have the new entries so defaults are calculated, usually by judging the intensity of what the decoration is drawn on and contrasted with that. To check things out look at the standard, KStep, and System styles under color schemes like default, CDE, and Digital CDE. The Be style is not updated because I have a cooler one on my HD ;-) I hope this makes David happier <grin> :) git-svn-id: svn+ssh://svn.kde.org/home/kde/trunk/kdebase/kwin@39126 283d02a7-25f6-0310-bc7c-ecb5cbfe19da 9aa3f77de64c588bd85cca9c5c12a1cf7abf2fc1 Daniel M. Duley daniel.duley@verizon.net