Diffstat (limited to 'microkde/KDGanttMinimizeSplitter.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | microkde/KDGanttMinimizeSplitter.cpp | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/microkde/KDGanttMinimizeSplitter.cpp b/microkde/KDGanttMinimizeSplitter.cpp index fb5d4e3..72c4e60 100644 --- a/microkde/KDGanttMinimizeSplitter.cpp +++ b/microkde/KDGanttMinimizeSplitter.cpp | |||
@@ -39,44 +39,57 @@ | |||
39 | #include "qbitmap.h" | 39 | #include "qbitmap.h" |
40 | #if QT_VERSION >= 0x030000 | 40 | #if QT_VERSION >= 0x030000 |
41 | #include "qptrlist.h" | 41 | #include "qptrlist.h" |
42 | #include "qmemarray.h" | 42 | #include "qmemarray.h" |
43 | #else | 43 | #else |
44 | #include <qlist.h> | 44 | #include <qlist.h> |
45 | #include <qarray.h> | 45 | #include <qarray.h> |
46 | #define QPtrList QList | 46 | #define QPtrList QList |
47 | #define QMemArray QArray | 47 | #define QMemArray QArray |
48 | #endif | 48 | #endif |
49 | #include "qlayoutengine_p.h" | 49 | #include "qlayoutengine_p.h" |
50 | #include "qobjectlist.h" | 50 | #include "qobjectlist.h" |
51 | #include "qstyle.h" | 51 | #include "qstyle.h" |
52 | #include "qapplication.h" //sendPostedEvents | 52 | #include "qapplication.h" //sendPostedEvents |
53 | #include <qvaluelist.h> | 53 | #include <qvaluelist.h> |
54 | #include <qcursor.h> | 54 | #include <qcursor.h> |
55 | #include <qframe.h> | ||
55 | #ifndef KDGANTT_MASTER_CVS | 56 | #ifndef KDGANTT_MASTER_CVS |
56 | //#include "KDGanttMinimizeSplitter.moc" | 57 | //#include "KDGanttMinimizeSplitter.moc" |
57 | #endif | 58 | #endif |
58 | 59 | ||
59 | 60 | ||
60 | 61 | ||
61 | #ifndef DOXYGEN_SKIP_INTERNAL | 62 | #ifndef DOXYGEN_SKIP_INTERNAL |
62 | 63 | ||
63 | #if QT_VERSION >= 232 | 64 | #if QT_VERSION >= 232 |
64 | static int mouseOffset; | 65 | static int mouseOffset; |
65 | static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky | 66 | static int opaqueOldPos = -1; //### there's only one mouse, but this is a bit risky |
66 | 67 | ||
68 | class KDRubberBand: public QFrame | ||
69 | { | ||
70 | public: | ||
71 | KDRubberBand( QWidget *parent, const char * name, WFlags f ) :QFrame ( parent, name, f ) {;} | ||
72 | |||
73 | protected: | ||
74 | virtual void mousePressEvent ( QMouseEvent * ) | ||
75 | { | ||
76 | close(); | ||
77 | }; | ||
78 | |||
79 | }; | ||
67 | 80 | ||
68 | KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o, | 81 | KDGanttSplitterHandle::KDGanttSplitterHandle( Qt::Orientation o, |
69 | KDGanttMinimizeSplitter *parent, const char * name ) | 82 | KDGanttMinimizeSplitter *parent, const char * name ) |
70 | : QWidget( parent, name ), _activeButton( 0 ), _collapsed( false ) | 83 | : QWidget( parent, name ), _activeButton( 0 ), _collapsed( false ) |
71 | { | 84 | { |
72 | 85 | ||
73 | if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->width() < 650 ) { | 86 | if ( QApplication::desktop()->width() > 320 && QApplication::desktop()->width() < 650 ) { |
74 | mSizeHint = QSize(7,7); | 87 | mSizeHint = QSize(7,7); |
75 | mUseOffset = true; | 88 | mUseOffset = true; |
76 | } else { | 89 | } else { |
77 | mSizeHint = QSize(6,6); | 90 | mSizeHint = QSize(6,6); |
78 | mUseOffset = false; | 91 | mUseOffset = false; |
79 | } | 92 | } |
80 | s = parent; | 93 | s = parent; |
81 | setOrientation(o); | 94 | setOrientation(o); |
82 | setMouseTracking( true ); | 95 | setMouseTracking( true ); |
@@ -176,34 +189,36 @@ void KDGanttSplitterHandle::mouseReleaseEvent( QMouseEvent *e ) | |||
176 | if ( _activeButton != 0 ) { | 189 | if ( _activeButton != 0 ) { |
177 | if ( onButton( e->pos() ) == _activeButton ) | 190 | if ( onButton( e->pos() ) == _activeButton ) |
178 | { | 191 | { |
179 | toggle(); | 192 | toggle(); |
180 | } | 193 | } |
181 | _activeButton = 0; | 194 | _activeButton = 0; |
182 | updateCursor( e->pos() ); | 195 | updateCursor( e->pos() ); |
183 | } | 196 | } |
184 | else { | 197 | else { |
185 | if ( !opaque() && e->button() == LeftButton ) { | 198 | if ( !opaque() && e->button() == LeftButton ) { |
186 | QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos())) | 199 | QCOORD pos = s->pick(parentWidget()->mapFromGlobal(e->globalPos())) |
187 | - mouseOffset; | 200 | - mouseOffset; |
188 | s->setRubberband( -1 ); | 201 | s->setRubberband( -1 ); |
189 | s->moveSplitter( pos, id() ); | 202 | s->moveSplitter( pos, id() ); |
190 | } | 203 | } |
191 | } | 204 | } |
192 | if ( s->rubberBand() ) | 205 | if ( s->rubberBand() ) { |
193 | s->rubberBand()->hide(); | 206 | //qDebug("hide rubberband "); |
207 | s->rubberBand()->close(); | ||
208 | } | ||
194 | repaint(); | 209 | repaint(); |
195 | } | 210 | } |
196 | 211 | ||
197 | int KDGanttSplitterHandle::onButton( const QPoint& p ) | 212 | int KDGanttSplitterHandle::onButton( const QPoint& p ) |
198 | { | 213 | { |
199 | QValueList<QPointArray> list = buttonRegions(); | 214 | QValueList<QPointArray> list = buttonRegions(); |
200 | int index = 1; | 215 | int index = 1; |
201 | int add = 12; | 216 | int add = 12; |
202 | for( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { | 217 | for( QValueList<QPointArray>::Iterator it = list.begin(); it != list.end(); ++it ) { |
203 | QRect rect = (*it).boundingRect(); | 218 | QRect rect = (*it).boundingRect(); |
204 | rect.setLeft( rect.left()- add ); | 219 | rect.setLeft( rect.left()- add ); |
205 | rect.setRight( rect.right() + add); | 220 | rect.setRight( rect.right() + add); |
206 | rect.setTop( rect.top()- add ); | 221 | rect.setTop( rect.top()- add ); |
207 | rect.setBottom( rect.bottom() + add); | 222 | rect.setBottom( rect.bottom() + add); |
208 | if ( rect.contains( p ) ) { | 223 | if ( rect.contains( p ) ) { |
209 | return index; | 224 | return index; |
@@ -668,33 +683,33 @@ void KDGanttMinimizeSplitter::setRubberband( int p ) | |||
668 | if ( orient == Horizontal ) { | 683 | if ( orient == Horizontal ) { |
669 | if ( opaqueOldPos >= 0 ) | 684 | if ( opaqueOldPos >= 0 ) |
670 | paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), | 685 | paint.drawRect( opaqueOldPos + sw/2 - rBord , r.y(), |
671 | 2*rBord, r.height() ); | 686 | 2*rBord, r.height() ); |
672 | if ( p >= 0 ) | 687 | if ( p >= 0 ) |
673 | paint.drawRect( p + sw/2 - rBord, r.y(), 2*rBord, r.height() ); | 688 | paint.drawRect( p + sw/2 - rBord, r.y(), 2*rBord, r.height() ); |
674 | } else { | 689 | } else { |
675 | if ( opaqueOldPos >= 0 ) | 690 | if ( opaqueOldPos >= 0 ) |
676 | paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord, | 691 | paint.drawRect( r.x(), opaqueOldPos + sw/2 - rBord, |
677 | r.width(), 2*rBord ); | 692 | r.width(), 2*rBord ); |
678 | if ( p >= 0 ) | 693 | if ( p >= 0 ) |
679 | paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord ); | 694 | paint.drawRect( r.x(), p + sw/2 - rBord, r.width(), 2*rBord ); |
680 | } | 695 | } |
681 | opaqueOldPos = p; | 696 | opaqueOldPos = p; |
682 | #else | 697 | #else |
683 | if ( !mRubberBand ) { | 698 | if ( !mRubberBand ) { |
684 | mRubberBand = new QFrame( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop); | 699 | mRubberBand = new KDRubberBand( 0, "rubber", WStyle_NoBorder | WStyle_Customize | WStyle_StaysOnTop); |
685 | mRubberBand->setFrameStyle( Box | Raised ); | 700 | mRubberBand->setFrameStyle( Box | Raised ); |
686 | //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) ); | 701 | //mRubberBand->setPalette( QPalette ( Qt::red.light(),Qt::red.dark() ) ); |
687 | mRubberBand->setPalette( QPalette ( colorGroup().background().light(), colorGroup().background().dark() )); | 702 | mRubberBand->setPalette( QPalette ( colorGroup().background().light(), colorGroup().background().dark() )); |
688 | } | 703 | } |
689 | QRect r = contentsRect(); | 704 | QRect r = contentsRect(); |
690 | static int rBord = 0; //Themable???? | 705 | static int rBord = 0; //Themable???? |
691 | if ( !rBord ) { | 706 | if ( !rBord ) { |
692 | if (QApplication::desktop()->width() <= 320 ) | 707 | if (QApplication::desktop()->width() <= 320 ) |
693 | rBord = 3; | 708 | rBord = 3; |
694 | else | 709 | else |
695 | rBord = 4; | 710 | rBord = 4; |
696 | } | 711 | } |
697 | int sw = style().splitterWidth(); | 712 | int sw = style().splitterWidth(); |
698 | if ( orient == Horizontal ) { | 713 | if ( orient == Horizontal ) { |
699 | if ( p >= 0 ) { | 714 | if ( p >= 0 ) { |
700 | QPoint geo = mapToGlobal (QPoint ( p + sw/2 - rBord, r.y())); | 715 | QPoint geo = mapToGlobal (QPoint ( p + sw/2 - rBord, r.y())); |