diff options
| author | Michele Calgaro <[email protected]> | 2014-11-15 23:55:01 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2014-11-15 23:55:01 +0900 |
| commit | 8a6ce15a94e441d514ed4076ea787c0b33b37194 (patch) | |
| tree | a132de80669ec6214146a3b6e24c879b2eee3eb6 /libkonq/konq_iconviewwidget.cc | |
| parent | 0a2adc65fa82ffdf5cfa3f7e669614b5474da42b (diff) | |
| parent | f07158cd9dcb61b32e7dba5674e8ed0f7c8c6fe2 (diff) | |
| download | tdebase-8a6ce15a94e441d514ed4076ea787c0b33b37194.tar.gz tdebase-8a6ce15a94e441d514ed4076ea787c0b33b37194.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
Diffstat (limited to 'libkonq/konq_iconviewwidget.cc')
| -rw-r--r-- | libkonq/konq_iconviewwidget.cc | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cc index 8cb222659..96e04df29 100644 --- a/libkonq/konq_iconviewwidget.cc +++ b/libkonq/konq_iconviewwidget.cc @@ -709,14 +709,16 @@ void KonqIconViewWidget::setItemTextPos( ItemTextPos pos ) // can't call gridXValue() because this already would need the new itemTextPos() int sz = m_size ? m_size : TDEGlobal::iconLoader()->currentSize( TDEIcon::Desktop ); - if ( m_bSetGridX ) - if ( pos == TQIconView::Bottom ) + if ( m_bSetGridX ) { + if ( pos == TQIconView::Bottom ) { setGridX( TQMAX( sz + 50, previewIconSize( sz ) + 13 ) ); + } else { setMaxItemWidth( TQMAX( sz, previewIconSize( sz ) ) + m_pSettings->iconTextWidth() ); setGridX( -1 ); } + } TDEIconView::setItemTextPos( pos ); } @@ -773,14 +775,16 @@ void KonqIconViewWidget::gridValues( int* x, int* y, int* dx, int* dy, void KonqIconViewWidget::calculateGridX() { - if ( m_bSetGridX ) - if ( itemTextPos() == TQIconView::Bottom ) + if ( m_bSetGridX ) { + if ( itemTextPos() == TQIconView::Bottom ) { setGridX( gridXValue() ); + } else { setMaxItemWidth( gridXValue() ); setGridX( -1 ); } + } } int KonqIconViewWidget::gridXValue() const |