Attachment #52315 for bug #83578

View | Details | Raw Unified | Return to bug 83578
Collapse All | Expand All

Lines 108-116 private slots: Link Here

(-)baghira-0.6b/bab/bab.h (-4 / +4 lines)
108	class Corner : public QWidget	108	class Corner : public QWidget
109	{	109	{
110	Q_OBJECT	110	Q_OBJECT
111	public:	111	public:
112	enum Side {left = 0, right};	112	enum Side {left = 0, right};
113	Corner(Side side);	113	Corner(Side side);
114	};	114	};
115		115
116	#endif // _BAB_H_	116	#endif // _BAB_H_





Corner::Corner(Side side) : QWidget(0, (side == left)?"left_corner":"right_corner", Qt::WType_TopLevel | Qt::WStyle_NoBorder | Qt::WStyle_StaysOnTop | Qt::WX11BypassWM )
{
    
    if (side == left) {
        setFixedSize(5,4);
        move(0,0);

        xrects[ 3 ].x = 0;
        xrects[ 3 ].y = 3;
        xrects[ 3 ].width = 1;
        xrects[ 3 ].height = 2;
        XShapeCombineRectangles( qt_xdisplay(), winId(), ShapeBounding, 0, 0,
                                 xrects, 4, ShapeSet, 0 );
        delete[] xrects;
    }
    else {

        xrects[ 3 ].x = 4;
        xrects[ 3 ].y = 3;
        xrects[ 3 ].width = 1;
        xrects[ 3 ].height = 2;
        XShapeCombineRectangles( qt_xdisplay(), winId(), ShapeBounding, 0, 0,
                                 xrects, 4, ShapeSet, 0 );
        delete[] xrects;
    }
}

Lines 1573-1580 bool BaghiraClient::eventFilter( QObject Link Here

(-)baghira-0.6b/deco/baghiraclient.cc (+2 lines)
1573	case QEvent::MouseButtonPress: {	1573	case QEvent::MouseButtonPress: {
1574	if (titlebar_->geometry().contains( static_cast<QMouseEvent >(e)->pos() ) && static_cast<QMouseEvent >(e)->state() == Qt::ControlButton){	1574	if (titlebar_->geometry().contains( static_cast<QMouseEvent >(e)->pos() ) && static_cast<QMouseEvent >(e)->state() == Qt::ControlButton){
1575	currentStyle < 2 ? currentStyle++ : currentStyle = 0;	1575	currentStyle < 2 ? currentStyle++ : currentStyle = 0;
		1576	#if KDE_IS_VERSION(3,3,91)
1576	unsigned long wmDesign = currentStyle;	1577	unsigned long wmDesign = currentStyle;
1577	XChangeProperty(qt_xdisplay(), windowId(), baghira_deco_design, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &wmDesign, 1L);	1578	XChangeProperty(qt_xdisplay(), windowId(), baghira_deco_design, XA_CARDINAL, 32, PropModeReplace, (unsigned char *) &wmDesign, 1L);
		1579	#endif
1578	widget()->repaint();	1580	widget()->repaint();
1579	QBitmap *m = NULL;	1581	QBitmap *m = NULL;
1580	QBitmap *mn = NULL;	1582	QBitmap *mn = NULL;

Lines 147-158 void Applet::windowAdded( WId w_P ) Link Here

(-)baghira-0.6b/kickermenu/menuapplet.cpp (+3 lines)
147	title = new QString( classHint.res_class );	147	title = new QString( classHint.res_class );
148	XFree( classHint.res_name );	148	XFree( classHint.res_name );
149	XFree( classHint.res_class );	149	XFree( classHint.res_class );
		150	if (title->contains("SDL_App"))
		151	goto titlejump; //sorry - mainly for scummvm apps
150	windowTitleDict.insert(w_P, title);	152	windowTitleDict.insert(w_P, title);
151	}	153	}
152	else	154	else
153	{ //fallback	155	{ //fallback
154	// for windowindicator	156	// for windowindicator
155	if (!windowTitleDict[w_P] && w_P != qt_xrootwin()){	157	if (!windowTitleDict[w_P] && w_P != qt_xrootwin()){
		158	titlejump:
156	KWin::WindowInfo tmpInfo = KWin::windowInfo( w_P, NET::WMName );	159	KWin::WindowInfo tmpInfo = KWin::windowInfo( w_P, NET::WMName );
157	//generate title:	160	//generate title:
158	title = new QString(tmpInfo.name());	161	title = new QString(tmpInfo.name());




// 				break;
				}
			case PE_Separator:
			case PE_DockWindowSeparator: {
                            break; //don't draw anything
                                //qWarning("%s",p->device()->className());
                                if (!(p->device() && p->device()->devType() == QInternal::Widget && ::qt_cast<QToolBar*>((QWidget*)p->device()))){
				if ( !( flags & Style_Horizontal ) ) {
					p->setPen( cg.mid() );
					p->drawLine( 4, r.height() / 2, r.width() - 5, r.height() / 2 );

				if ( widget == highlightWidget )
					bflags |= Style_MouseOver;
				if ( controls & SC_ToolButton ) {
                                    bool sunken = mflags & ( Style_Down /*| Style_On*/ );
                                        bool hover = bflags & (Style_MouseOver | Style_On );
                                        
                                        if ( !optionHandler->useToolButtonFrame() || !(toolbutton->parentWidget() && ( ::qt_cast<QToolBar*>(toolbutton->parentWidget()) || toolbutton->parentWidget()->inherits("KonqFrameTabs")))) {
                                            if (!(hover || sunken) && toolbutton->parentWidget() && !::qt_cast<QToolBar*>(toolbutton->parent()) && toolbutton->parentWidget()->paletteBackgroundPixmap() && !toolbutton->parentWidget()->paletteBackgroundPixmap()->isNull()) {

Lines 168-174 void OptionHandler::reloadSettings() { Link Here

(-)baghira-0.6b/style/optionHandler.cpp (-1 / +1 lines)
168	animateSlider = config.readBoolEntry( "Special_AnimateSlider", true );	168	animateSlider = config.readBoolEntry( "Special_AnimateSlider", true );
169	// toolbar	169	// toolbar
170	int utb = config.readNumEntry( "Special_UnhoveredToolButtons", 2 );	170	int utb = config.readNumEntry( "Special_UnhoveredToolButtons", 2 );
171	tbFrame = utb == 2 \|\| (brushMe && utb == 1) \|\| (!brushMe && utb == 0);	171	tbFrame = (utb == 2) \|\| (brushMe && (utb == 1)) \|\| (!brushMe && (utb == 0));
172		172
173	// tweaks	173	// tweaks
174	centerTabs = config.readBoolEntry( "Design_CenterTabs", true);	174	centerTabs = config.readBoolEntry( "Design_CenterTabs", true);




                    if (w->inherits( "QPushButton" ))
                    {
                        ButtonFadeInfo *bfi_ = bfi[w->winId()];
                        if (bfi_){
                        if (bfi_->timerId != 0)
                            w->killTimer(bfi_->timerId);
                        bfi.setAutoDelete(TRUE);
                        bfi.remove(w->winId());
                        }
                    }
		  w->setBackgroundMode( QWidget::PaletteButton );
		} else if ( w->inherits( "QScrollBar" ) ) {

Return to bug 83578

Lines 435-441 void BabSwitcher::paintEvent(QPaintEvent Link Here

(-)baghira-0.6b/bab/main.cpp (-5 / +4 lines)
435		435
436	Corner::Corner(Side side) : QWidget(0, (side == left)?"left_corner":"right_corner", Qt::WType_TopLevel \| Qt::WStyle_NoBorder \| Qt::WStyle_StaysOnTop \| Qt::WX11BypassWM )	436	Corner::Corner(Side side) : QWidget(0, (side == left)?"left_corner":"right_corner", Qt::WType_TopLevel \| Qt::WStyle_NoBorder \| Qt::WStyle_StaysOnTop \| Qt::WX11BypassWM )
437	{	437	{
438
439	if (side == left) {	438	if (side == left) {
440	setFixedSize(5,4);	439	setFixedSize(5,4);
441	move(0,0);	440	move(0,0);
Lines 457-465 Corner::Corner(Side side) : QWidget(0, ( Link Here
457	xrects[ 3 ].x = 0;	456	xrects[ 3 ].x = 0;
458	xrects[ 3 ].y = 3;	457	xrects[ 3 ].y = 3;
459	xrects[ 3 ].width = 1;	458	xrects[ 3 ].width = 1;
460	xrects[ 3 ].height = 2;	459	xrects[ 3 ].height = 2;
461	XShapeCombineRectangles( qt_xdisplay(), winId(), ShapeBounding, 0, 0,	460	XShapeCombineRectangles( qt_xdisplay(), winId(), ShapeBounding, 0, 0,
462	xrects, 4, ShapeSet, 0 );	461	xrects, 4, ShapeSet, 0 );
463	delete[] xrects;	462	delete[] xrects;
464	}	463	}
465	else {	464	else {
Lines 483-491 Corner::Corner(Side side) : QWidget(0, ( Link Here
483	xrects[ 3 ].x = 4;	482	xrects[ 3 ].x = 4;
484	xrects[ 3 ].y = 3;	483	xrects[ 3 ].y = 3;
485	xrects[ 3 ].width = 1;	484	xrects[ 3 ].width = 1;
486	xrects[ 3 ].height = 2;	485	xrects[ 3 ].height = 2;
487	XShapeCombineRectangles( qt_xdisplay(), winId(), ShapeBounding, 0, 0,	486	XShapeCombineRectangles( qt_xdisplay(), winId(), ShapeBounding, 0, 0,
488	xrects, 4, ShapeSet, 0 );	487	xrects, 4, ShapeSet, 0 );
489	delete[] xrects;	488	delete[] xrects;
490	}	489	}
491	}	490	}

Lines 1168-1176 void LiquidStyle::drawPrimitive( Primiti Link Here

(-)baghira-0.6b/style/baghira.cpp (-4 / +5 lines)
1168	// break;	1168	// break;
1169	}	1169	}
1170	case PE_Separator:	1170	case PE_Separator:
1171	/case PE_DockWindowSeparator:/ {	1171	case PE_DockWindowSeparator: {
		1172	break; //don't draw anything
1172	//qWarning("%s",p->device()->className());	1173	//qWarning("%s",p->device()->className());
1173	if (!(p->device() && p->device()->devType() == QInternal::Widget && ::qt_cast<QToolBar>((QWidget)p->device()) /((QWidget)p->device())->inherits("QToolBar")*/)){	1174	if (!(p->device() && p->device()->devType() == QInternal::Widget && ::qt_cast<QToolBar>((QWidget)p->device()))){
1174	if ( !( flags & Style_Horizontal ) ) {	1175	if ( !( flags & Style_Horizontal ) ) {
1175	p->setPen( cg.mid() );	1176	p->setPen( cg.mid() );
1176	p->drawLine( 4, r.height() / 2, r.width() - 5, r.height() / 2 );	1177	p->drawLine( 4, r.height() / 2, r.width() - 5, r.height() / 2 );
Lines 1997-2004 void LiquidStyle::drawComplexControl( Co Link Here
1997	if ( widget == highlightWidget )	1998	if ( widget == highlightWidget )
1998	bflags \|= Style_MouseOver;	1999	bflags \|= Style_MouseOver;
1999	if ( controls & SC_ToolButton ) {	2000	if ( controls & SC_ToolButton ) {
2000	bool sunken = mflags & ( Style_Down \| Style_On );	2001	bool sunken = mflags & ( Style_Down /\| Style_On/ );
2001	bool hover = bflags & Style_MouseOver;	2002	bool hover = bflags & (Style_MouseOver \| Style_On );
2002		2003
2003	if ( !optionHandler->useToolButtonFrame() \|\| !(toolbutton->parentWidget() && ( ::qt_cast<QToolBar*>(toolbutton->parentWidget()) \|\| toolbutton->parentWidget()->inherits("KonqFrameTabs")))) {	2004	if ( !optionHandler->useToolButtonFrame() \|\| !(toolbutton->parentWidget() && ( ::qt_cast<QToolBar*>(toolbutton->parentWidget()) \|\| toolbutton->parentWidget()->inherits("KonqFrameTabs")))) {
2004	if (!(hover \|\| sunken) && toolbutton->parentWidget() && !::qt_cast<QToolBar*>(toolbutton->parent()) && toolbutton->parentWidget()->paletteBackgroundPixmap() && !toolbutton->parentWidget()->paletteBackgroundPixmap()->isNull()) {	2005	if (!(hover \|\| sunken) && toolbutton->parentWidget() && !::qt_cast<QToolBar*>(toolbutton->parent()) && toolbutton->parentWidget()->paletteBackgroundPixmap() && !toolbutton->parentWidget()->paletteBackgroundPixmap()->isNull()) {

Lines 910-919 void LiquidStyle::unPolish( QWidget *w ) Link Here

(-)baghira-0.6b/style/polish.cpp (+2 lines)
910	if (w->inherits( "QPushButton" ))	910	if (w->inherits( "QPushButton" ))
911	{	911	{
912	ButtonFadeInfo *bfi_ = bfi[w->winId()];	912	ButtonFadeInfo *bfi_ = bfi[w->winId()];
		913	if (bfi_){
913	if (bfi_->timerId != 0)	914	if (bfi_->timerId != 0)
914	w->killTimer(bfi_->timerId);	915	w->killTimer(bfi_->timerId);
915	bfi.setAutoDelete(TRUE);	916	bfi.setAutoDelete(TRUE);
916	bfi.remove(w->winId());	917	bfi.remove(w->winId());
		918	}
917	}	919	}
918	w->setBackgroundMode( QWidget::PaletteButton );	920	w->setBackgroundMode( QWidget::PaletteButton );
919	} else if ( w->inherits( "QScrollBar" ) ) {	921	} else if ( w->inherits( "QScrollBar" ) ) {