summaryrefslogtreecommitdiff
path: root/libopie
authorzecke <zecke>2003-09-04 17:04:06 (UTC)
committer zecke <zecke>2003-09-04 17:04:06 (UTC)
commit302e9b70ecb247977decf97269807abe5eccbdd7 (patch) (side-by-side diff)
tree59bb2fe59f0ced82acd0d3529af16c0e0d516772 /libopie
parentd11827ca5879b21488c189fb09f32ecf635644ae (diff)
downloadopie-302e9b70ecb247977decf97269807abe5eccbdd7.zip
opie-302e9b70ecb247977decf97269807abe5eccbdd7.tar.gz
opie-302e9b70ecb247977decf97269807abe5eccbdd7.tar.bz2
Rely on QFRame for the sizeHint
Diffstat (limited to 'libopie') (more/less context) (show whitespace changes)
-rw-r--r--libopie/big-screen/osplitter.cpp7
-rw-r--r--libopie/big-screen/osplitter.h5
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{
return m_tabWidget->currentWidget();
else if (m_parentTab )
return m_parentTab->currentWidget();
return 0l;
}
-
-
+/* wrong */
+#if 0
/**
* @reimplented for internal reasons
* returns the sizeHint of one of its sub widgets
*/
QSize OSplitter::sizeHint()const {
if (m_parentTab )
@@ -327,13 +327,13 @@ QSize OSplitter::minimumSizeHint()const {
return QFrame::minimumSizeHint();
if (m_hbox)
return m_hbox->sizeHint();
else
return m_tabWidget->sizeHint();
}
-
+#endif
/**
* @reimplemented for internal reasons
*/
void OSplitter::resizeEvent( QResizeEvent* res ) {
QFrame::resizeEvent( res );
@@ -512,12 +512,13 @@ void OSplitter::commonChangeBox() {
else {
qWarning(" setting Box geometry for %s", name() );
m_hbox->setGeometry( frameRect() );
m_hbox->show();
delete m_tabWidget;
m_tabWidget = 0;
+ show(); // also show this widget
}
}
/*
* sets the tabwidget, removes tabs, and relayouts the widget
*/
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:
void setCurrentWidget( QWidget* );
void setCurrentWidget( const QString& label );
void setCurrentWidget( int );
QWidget* currentWidget()const;
+
signals:
/**
* Emitted if in tab and comes directly from the tab widget
*
*/
void currentChanged( QWidget* );
@@ -105,14 +106,14 @@ signals:
* this signal is emitted after the layout switch
* @param b The layout mode
* @param ori The orientation
*/
void sizeChanged( bool b, Orientation ori);
public:
- QSize sizeHint()const;
- QSize minimumSizeHint()const;
+// QSize sizeHint()const;
+// QSize minimumSizeHint()const;
protected:
void resizeEvent( QResizeEvent* );
private:
/* true if OTabMode */