author | zecke <zecke> | 2003-09-04 17:04:06 (UTC) |
---|---|---|
committer | zecke <zecke> | 2003-09-04 17:04:06 (UTC) |
commit | 302e9b70ecb247977decf97269807abe5eccbdd7 (patch) (unidiff) | |
tree | 59bb2fe59f0ced82acd0d3529af16c0e0d516772 | |
parent | d11827ca5879b21488c189fb09f32ecf635644ae (diff) | |
download | opie-302e9b70ecb247977decf97269807abe5eccbdd7.zip opie-302e9b70ecb247977decf97269807abe5eccbdd7.tar.gz opie-302e9b70ecb247977decf97269807abe5eccbdd7.tar.bz2 |
Rely on QFRame for the sizeHint
-rw-r--r-- | libopie/big-screen/osplitter.cpp | 7 | ||||
-rw-r--r-- | libopie/big-screen/osplitter.h | 5 |
2 files changed, 7 insertions, 5 deletions
diff --git a/libopie/big-screen/osplitter.cpp b/libopie/big-screen/osplitter.cpp index b09bc94..0c9ed6c 100644 --- a/libopie/big-screen/osplitter.cpp +++ b/libopie/big-screen/osplitter.cpp | |||
@@ -303,14 +303,14 @@ QWidget* OSplitter::currentWidget() const{ | |||
303 | return m_tabWidget->currentWidget(); | 303 | return m_tabWidget->currentWidget(); |
304 | else if (m_parentTab ) | 304 | else if (m_parentTab ) |
305 | return m_parentTab->currentWidget(); | 305 | return m_parentTab->currentWidget(); |
306 | 306 | ||
307 | return 0l; | 307 | return 0l; |
308 | } | 308 | } |
309 | 309 | /* wrong */ | |
310 | 310 | #if 0 | |
311 | /** | 311 | /** |
312 | * @reimplented for internal reasons | 312 | * @reimplented for internal reasons |
313 | * returns the sizeHint of one of its sub widgets | 313 | * returns the sizeHint of one of its sub widgets |
314 | */ | 314 | */ |
315 | QSize OSplitter::sizeHint()const { | 315 | QSize OSplitter::sizeHint()const { |
316 | if (m_parentTab ) | 316 | if (m_parentTab ) |
@@ -327,13 +327,13 @@ QSize OSplitter::minimumSizeHint()const { | |||
327 | return QFrame::minimumSizeHint(); | 327 | return QFrame::minimumSizeHint(); |
328 | if (m_hbox) | 328 | if (m_hbox) |
329 | return m_hbox->sizeHint(); | 329 | return m_hbox->sizeHint(); |
330 | else | 330 | else |
331 | return m_tabWidget->sizeHint(); | 331 | return m_tabWidget->sizeHint(); |
332 | } | 332 | } |
333 | 333 | #endif | |
334 | 334 | ||
335 | /** | 335 | /** |
336 | * @reimplemented for internal reasons | 336 | * @reimplemented for internal reasons |
337 | */ | 337 | */ |
338 | void OSplitter::resizeEvent( QResizeEvent* res ) { | 338 | void OSplitter::resizeEvent( QResizeEvent* res ) { |
339 | QFrame::resizeEvent( res ); | 339 | QFrame::resizeEvent( res ); |
@@ -512,12 +512,13 @@ void OSplitter::commonChangeBox() { | |||
512 | else { | 512 | else { |
513 | qWarning(" setting Box geometry for %s", name() ); | 513 | qWarning(" setting Box geometry for %s", name() ); |
514 | m_hbox->setGeometry( frameRect() ); | 514 | m_hbox->setGeometry( frameRect() ); |
515 | m_hbox->show(); | 515 | m_hbox->show(); |
516 | delete m_tabWidget; | 516 | delete m_tabWidget; |
517 | m_tabWidget = 0; | 517 | m_tabWidget = 0; |
518 | show(); // also show this widget | ||
518 | } | 519 | } |
519 | } | 520 | } |
520 | 521 | ||
521 | /* | 522 | /* |
522 | * sets the tabwidget, removes tabs, and relayouts the widget | 523 | * sets the tabwidget, removes tabs, and relayouts the widget |
523 | */ | 524 | */ |
diff --git a/libopie/big-screen/osplitter.h b/libopie/big-screen/osplitter.h index 33a085f..61a247b 100644 --- a/libopie/big-screen/osplitter.h +++ b/libopie/big-screen/osplitter.h | |||
@@ -88,12 +88,13 @@ public: | |||
88 | 88 | ||
89 | void setCurrentWidget( QWidget* ); | 89 | void setCurrentWidget( QWidget* ); |
90 | void setCurrentWidget( const QString& label ); | 90 | void setCurrentWidget( const QString& label ); |
91 | void setCurrentWidget( int ); | 91 | void setCurrentWidget( int ); |
92 | QWidget* currentWidget()const; | 92 | QWidget* currentWidget()const; |
93 | 93 | ||
94 | |||
94 | signals: | 95 | signals: |
95 | /** | 96 | /** |
96 | * Emitted if in tab and comes directly from the tab widget | 97 | * Emitted if in tab and comes directly from the tab widget |
97 | * | 98 | * |
98 | */ | 99 | */ |
99 | void currentChanged( QWidget* ); | 100 | void currentChanged( QWidget* ); |
@@ -105,14 +106,14 @@ signals: | |||
105 | * this signal is emitted after the layout switch | 106 | * this signal is emitted after the layout switch |
106 | * @param b The layout mode | 107 | * @param b The layout mode |
107 | * @param ori The orientation | 108 | * @param ori The orientation |
108 | */ | 109 | */ |
109 | void sizeChanged( bool b, Orientation ori); | 110 | void sizeChanged( bool b, Orientation ori); |
110 | public: | 111 | public: |
111 | QSize sizeHint()const; | 112 | // QSize sizeHint()const; |
112 | QSize minimumSizeHint()const; | 113 | // QSize minimumSizeHint()const; |
113 | 114 | ||
114 | protected: | 115 | protected: |
115 | void resizeEvent( QResizeEvent* ); | 116 | void resizeEvent( QResizeEvent* ); |
116 | 117 | ||
117 | private: | 118 | private: |
118 | /* true if OTabMode */ | 119 | /* true if OTabMode */ |