From 4dc80faf840ee48bd4c0b8d5338a5274de013c39 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 7 Apr 2013 22:15:56 -0500 Subject: Use correct icon area when placing new icons This resolves another long-standing bug where saved icons are moved to make way for new icons --- kdesktop/kdiconview.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kdesktop/kdiconview.h') diff --git a/kdesktop/kdiconview.h b/kdesktop/kdiconview.h index bc24308f6..c18b0d9d5 100644 --- a/kdesktop/kdiconview.h +++ b/kdesktop/kdiconview.h @@ -110,9 +110,9 @@ public: void startDirLister(); - TQPoint findPlaceForIconCol( int column, int dx, int dy ); - TQPoint findPlaceForIconRow( int row, int dx, int dy ); - TQPoint findPlaceForIcon( int column, int row ); + TQPoint findPlaceForIconCol( int column, int dx, int dy, const TQRect ¤tIconArea ); + TQPoint findPlaceForIconRow( int row, int dx, int dy, const TQRect ¤tIconArea ); + TQPoint findPlaceForIcon( int column, int row, const TQRect ¤tIconArea = TQRect() ); protected slots: @@ -173,9 +173,9 @@ protected: bool makeFriendlyText( KFileIVI *fileIVI ); static TQString stripDesktopExtension( const TQString & text ); bool isDesktopFile( KFileItem * _item ) const; - bool isFreePosition( const TQIconViewItem *item ) const; - bool isFreePosition( const TQIconViewItem *item, const TQRect& rect ) const; - void moveToFreePosition(TQIconViewItem *item ); + bool isFreePosition( const TQIconViewItem *item, const TQRect ¤tIconArea ) const; + bool isFreePosition( const TQIconViewItem *item, const TQRect& rect, const TQRect ¤tIconArea ) const; + void moveToFreePosition(TQIconViewItem *item, const TQRect ¤tIconArea ); bool deleteGlobalDesktopFiles(); void removeBuiltinIcon(TQString iconName); -- cgit v1.2.3