slightly improved default look

svn path=/trunk/kdebase/kwin/; revision=34604
This commit is contained in:
Matthias Ettrich 1999-11-21 17:17:34 +00:00
parent 4bc6ce23fb
commit eb5e8e031d
3 changed files with 10 additions and 6 deletions

View file

@ -61,7 +61,7 @@ void Options::reload()
config->setGroup("WM");
// normal colors
colors[Frame] = Qt::lightGray;
colors[Frame] = pal.normal().background();
colors[Frame] = config->readColorEntry("frame", &colors[Frame]);
colors[Handle] = QColor( 140, 140, 140 );
colors[Handle] = config->readColorEntry("handle", &colors[Handle]);
@ -74,7 +74,7 @@ void Options::reload()
colors[ButtonBlend] = colors[ ButtonBg ].dark(150);
colors[ButtonBlend] = config->readColorEntry("activeTitleBtnBlend",
&colors[ButtonBlend]);
colors[TitleBar] = Qt::darkBlue;
colors[TitleBar] = pal.normal().highlight();
colors[TitleBar] = config->readColorEntry("activeBackground",
&colors[TitleBar]);
if(QPixmap::defaultDepth() < 15)
@ -84,7 +84,7 @@ void Options::reload()
colors[TitleBlend] = config->readColorEntry("activeBlend",
&colors[TitleBlend]);
colors[Font] = Qt::white;
colors[Font] = pal.normal().highlightedText();
colors[Font] = config->readColorEntry("activeForeground", &colors[Font]);
colors[ButtonFg] = Qt::darkGray;
colors[ButtonFg] = config->readColorEntry("activeTitleBtnFg",
@ -93,7 +93,7 @@ void Options::reload()
// inactive
colors[Frame+KWINCOLORS] = config->readColorEntry("inactiveFrame",
&colors[Frame]);
colors[TitleBar+KWINCOLORS] = colors[Frame].dark();
colors[TitleBar+KWINCOLORS] = colors[Frame];
colors[TitleBar+KWINCOLORS] = config->
readColorEntry("inactiveBackground", &colors[TitleBar+KWINCOLORS]);
@ -123,7 +123,7 @@ void Options::reload()
colors[Handle+KWINCOLORS] = colors[Frame];
config->readColorEntry("inactiveHandle", &colors[Handle]);
colors[Font+KWINCOLORS] = Qt::darkGray;
colors[Font+KWINCOLORS] = colors[Frame].dark();
colors[Font+KWINCOLORS] = config->readColorEntry("inactiveForeground",
&colors[Font+KWINCOLORS]);
@ -141,7 +141,7 @@ void Options::reload()
//CT well, what this costs us?
config->setGroup("Actions");
QString val;
val = config->readEntry("Placement","Smart");
if (val == "Smart") placement = Smart;

View file

@ -228,6 +228,7 @@ StdClient::StdClient( Workspace *ws, WId w, QWidget *parent, const char *name )
button[1]->setIconSet(isSticky() ? isActive() ? *pindown_pix : *dis_pindown_pix :
isActive() ? *pinup_pix : *dis_pinup_pix );
connect( button[1], SIGNAL( clicked() ), this, ( SLOT( toggleSticky() ) ) );
button[1]->hide(); // no sticky
button[2]->hide();
button[3]->setIconSet(isActive() ? *minimize_pix : *dis_minimize_pix);
@ -310,6 +311,8 @@ void StdClient::paintEvent( QPaintEvent* e)
p.setClipRegion( t );
t.setTop( 0 );
p.fillRect( t, options->color(Options::TitleBar, isActive()));
p.setPen( options->color(Options::TitleBar, isActive()).light() );
p.drawLine(t.left(), t.top()+1, t.right(), t.top()+1);
qDrawShadePanel( &p, t.x(), t.y(), t.width(), t.height(),
colorGroup(), true, 1 );
t.setLeft( t.left() + 4 );

View file

@ -1282,6 +1282,7 @@ void Workspace::setDecoration( int deco )
bool mapped = c->isVisible();
c->hide();
c->releaseWindow();
KWM::moveToDesktop( w, c->desktop() );
switch ( deco ) {
case 1:
c = new BeClient( this, w);