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

[codesite-noreply]

Revision: 6223
Author: nogu.dev
Date: Thu Mar  4 05:20:06 2010
Log: * qt4/candwin/qt4.cpp
  - (CandidateWindow::CandidateWindow,
     CandidateWindow::adjustCandidateWindowSize):
    Add dummy column to adjust size.
* qt4/immodule/candidatewindow.cpp
  - (CandidateWindow::CandidateWindow, CandidateListView::sizeHint):
    Ditto.
http://code.google.com/p/uim/source/detail?r=6223
Modified:
 /trunk/qt4/candwin/qt4.cpp
 /trunk/qt4/immodule/candidatewindow.cpp

=======================================
--- /trunk/qt4/candwin/qt4.cpp  Thu Mar  4 05:19:51 2010
+++ /trunk/qt4/candwin/qt4.cpp  Thu Mar  4 05:20:06 2010
@@ -81,8 +81,10 @@
     cList = new QTableWidget;
     cList->setSelectionMode( QAbstractItemView::SingleSelection );
     cList->setSelectionBehavior( QAbstractItemView::SelectRows );
-    cList->setColumnCount( 2 );
+    // the last column is dummy for adjusting size.
+    cList->setColumnCount( 3 );
     cList->horizontalHeader()->setResizeMode(  
QHeaderView::ResizeToContents );
+    cList->horizontalHeader()->setStretchLastSection( true );
     cList->horizontalHeader()->hide();
     cList->verticalHeader()->hide();
     cList->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
@@ -452,11 +454,8 @@
         resize( MIN_CAND_WIDTH, numLabel->height() + frame );
         return;
     }
-    const int columnNum = cList->columnCount();
-    QHeaderView *header = cList->horizontalHeader();
-    header->setResizeMode( columnNum - 1, QHeaderView::ResizeToContents );
     int width = frame;
-    for ( int i = 0; i < columnNum; i++ )
+    for ( int i = 0; i < cList->columnCount() - 1; i++ )
         width += cList->columnWidth( i );

     resize( width, cList->rowHeight( 0 ) * rowNum + numLabel->height()
=======================================
--- /trunk/qt4/immodule/candidatewindow.cpp     Thu Mar  4 05:19:51 2010
+++ /trunk/qt4/immodule/candidatewindow.cpp     Thu Mar  4 05:20:06 2010
@@ -69,8 +69,10 @@
     cList = new CandidateListView;
     cList->setSelectionMode( QAbstractItemView::SingleSelection );
     cList->setSelectionBehavior( QAbstractItemView::SelectRows );
-    cList->setColumnCount( 3 );
+    // the last column is dummy for adjusting size.
+    cList->setColumnCount( 4 );
     cList->horizontalHeader()->setResizeMode(  
QHeaderView::ResizeToContents );
+    cList->horizontalHeader()->setStretchLastSection( true );
     cList->horizontalHeader()->hide();
     cList->verticalHeader()->hide();
     cList->setHorizontalScrollBarPolicy( Qt::ScrollBarAlwaysOff );
@@ -517,11 +519,8 @@
     if ( rowNum == 0 ) {
         return QSize( MIN_CAND_WIDTH, frame );
     }
-    const int columnNum = columnCount();
-    QHeaderView *header = horizontalHeader();
-    header->setResizeMode( columnNum - 1, QHeaderView::ResizeToContents );
     int width = frame;
-    for ( int i = 0; i < columnNum; i++ )
+    for ( int i = 0; i < columnCount() - 1; i++ )
         width += columnWidth( i );

     return QSize( width, rowHeight( 0 ) * rowNum + frame );