[uim] r6222 committed - * qt4/candwin/qt4.cpp...

[codesite-noreply]

Revision: 6222
Author: nogu.dev
Date: Thu Mar  4 05:19:51 2010
Log: * qt4/candwin/qt4.cpp
  - (CandidateWindow::CandidateWindow,
     CandidateWindow::adjustCandidateWindowSize):
    Use setMinimumWidth.
* qt4/immodule/candidatewindow.cpp
  - (CandidateWindow::CandidateWindow, CandidateListView::sizeHint):
    Ditto.
http://code.google.com/p/uim/source/detail?r=6222

Modified:
 /trunk/qt4/candwin/qt4.cpp
 /trunk/qt4/immodule/candidatewindow.cpp

=======================================
--- /trunk/qt4/candwin/qt4.cpp  Wed Mar  3 05:57:08 2010
+++ /trunk/qt4/candwin/qt4.cpp  Thu Mar  4 05:19:51 2010
@@ -88,6 +88,7 @@
     cList->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     cList->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     cList->setShowGrid( false );
+    cList->setMinimumWidth( MIN_CAND_WIDTH );
     connect( cList, SIGNAL( cellClicked( int, int ) ),
           this , SLOT( slotCandidateSelected( int ) ) );

@@ -458,15 +459,6 @@
     for ( int i = 0; i < columnNum; i++ )
         width += cList->columnWidth( i );

-    if ( width < MIN_CAND_WIDTH ) {
-        header->setResizeMode( columnNum - 1, QHeaderView::Fixed );
-        // We use "MIN_CAND_WIDTH" as the column size because
-        // "header->sectionSize( columnNum - 1 ) + MIN_CAND_WIDTH - width"
-        // is too narrow in some environments.
-        header->resizeSection( columnNum - 1, MIN_CAND_WIDTH );
-        width = MIN_CAND_WIDTH;
-    }
-
     resize( width, cList->rowHeight( 0 ) * rowNum + numLabel->height()
         + frame );
 }
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp     Wed Mar  3 05:57:08 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp     Thu Mar  4 05:19:51 2010
@@ -76,6 +76,7 @@
     cList->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     cList->setVerticalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
     cList->setShowGrid( false );
+    cList->setMinimumWidth( MIN_CAND_WIDTH );
     connect( cList, SIGNAL( cellClicked( int, int ) ),
           this , SLOT( slotCandidateSelected( int ) ) );
     connect( cList, SIGNAL( itemSelectionChanged() ),
@@ -523,14 +524,5 @@
     for ( int i = 0; i < columnNum; i++ )
         width += columnWidth( i );

-    if ( width < MIN_CAND_WIDTH ) {
-        header->setResizeMode( columnNum - 1, QHeaderView::Fixed );
-        // We use "MIN_CAND_WIDTH" as the column size because
-        // "header->sectionSize( columnNum - 1 ) + MIN_CAND_WIDTH - width"
-        // is too narrow in some environments.
-        header->resizeSection( columnNum - 1, MIN_CAND_WIDTH );
-        width = MIN_CAND_WIDTH;
-    }
-
     return QSize( width, rowHeight( 0 ) * rowNum + frame );
 }