-rw-r--r-- | libqtaux/qsplitter.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libqtaux/qsplitter.cpp b/libqtaux/qsplitter.cpp index 39321f8..959d5e1 100644 --- a/libqtaux/qsplitter.cpp +++ b/libqtaux/qsplitter.cpp | |||
@@ -706,49 +706,49 @@ void QSplitter::doResize() | |||
706 | else | 706 | else |
707 | s->wid->setGeometry( r.left(), a[i].pos, r.width(), a[i].size ); | 707 | s->wid->setGeometry( r.left(), a[i].pos, r.width(), a[i].size ); |
708 | } | 708 | } |
709 | 709 | ||
710 | } | 710 | } |
711 | 711 | ||
712 | 712 | ||
713 | void QSplitter::recalc( bool update ) | 713 | void QSplitter::recalc( bool update ) |
714 | { | 714 | { |
715 | int fi = 2*frameWidth(); | 715 | int fi = 2*frameWidth(); |
716 | int maxl = fi; | 716 | int maxl = fi; |
717 | int minl = fi; | 717 | int minl = fi; |
718 | int maxt = QWIDGETSIZE_MAX; | 718 | int maxt = QWIDGETSIZE_MAX; |
719 | int mint = fi; | 719 | int mint = fi; |
720 | int n = data->list.count(); | 720 | int n = data->list.count(); |
721 | bool first = TRUE; | 721 | bool first = TRUE; |
722 | /* | 722 | /* |
723 | The splitter before a hidden widget is always hidden. | 723 | The splitter before a hidden widget is always hidden. |
724 | The splitter before the first visible widget is hidden. | 724 | The splitter before the first visible widget is hidden. |
725 | The splitter before any other visible widget is visible. | 725 | The splitter before any other visible widget is visible. |
726 | */ | 726 | */ |
727 | for ( int i = 0; i< n; i++ ) { | 727 | for ( int i = 0; i< n; i++ ) { |
728 | QSplitterLayoutStruct *s = data->list.at(i); | 728 | QSplitterLayoutStruct *s = data->list.at(i); |
729 | if ( !s->isSplitter ) { | 729 | if ( !s->isSplitter ) { |
730 | QSplitterLayoutStruct *p = (i > 0) ? p = data->list.at( i-1 ) : 0; | 730 | QSplitterLayoutStruct *p = (i > 0) ? data->list.at( i-1 ) : 0; |
731 | if ( p && p->isSplitter ) | 731 | if ( p && p->isSplitter ) |
732 | if ( first || s->wid->isHidden() ) | 732 | if ( first || s->wid->isHidden() ) |
733 | p->wid->hide(); //may trigger new recalc | 733 | p->wid->hide(); //may trigger new recalc |
734 | else | 734 | else |
735 | p->wid->show(); //may trigger new recalc | 735 | p->wid->show(); //may trigger new recalc |
736 | if ( !s->wid->isHidden() ) | 736 | if ( !s->wid->isHidden() ) |
737 | first = FALSE; | 737 | first = FALSE; |
738 | } | 738 | } |
739 | } | 739 | } |
740 | 740 | ||
741 | bool empty=TRUE; | 741 | bool empty=TRUE; |
742 | for ( int j = 0; j< n; j++ ) { | 742 | for ( int j = 0; j< n; j++ ) { |
743 | QSplitterLayoutStruct *s = data->list.at(j); | 743 | QSplitterLayoutStruct *s = data->list.at(j); |
744 | if ( !s->wid->isHidden() ) { | 744 | if ( !s->wid->isHidden() ) { |
745 | empty = FALSE; | 745 | empty = FALSE; |
746 | if ( s->isSplitter ) { | 746 | if ( s->isSplitter ) { |
747 | minl += s->sizer; | 747 | minl += s->sizer; |
748 | maxl += s->sizer; | 748 | maxl += s->sizer; |
749 | } else { | 749 | } else { |
750 | QSize minS = minSize(s->wid); | 750 | QSize minS = minSize(s->wid); |
751 | minl += pick( minS ); | 751 | minl += pick( minS ); |
752 | maxl += pick( s->wid->maximumSize() ); | 752 | maxl += pick( s->wid->maximumSize() ); |
753 | mint = QMAX( mint, trans( minS )); | 753 | mint = QMAX( mint, trans( minS )); |
754 | int tm = trans( s->wid->maximumSize() ); | 754 | int tm = trans( s->wid->maximumSize() ); |