From kde-commits  Sat Apr 30 21:44:18 2005
From: Pino Toscano <toscano.pino () tiscali ! it>
Date: Sat, 30 Apr 2005 21:44:18 +0000
To: kde-commits
Subject: kdeedu/kig/modes
Message-Id: <20050430214418.4DDBB629 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=111489747024167

CVS commit by pino: 

When selecting a custom color for one object, put the old object color as selected color in the Color dialog.
(Mmm... too many "color" in this commit message... ;)


  M +3 -1      popup.cc   1.67


--- kdeedu/kig/modes/popup.cc  #1.66:1.67
@@ -641,5 +641,7 @@ bool BuiltinObjectActionsProvider::execu
     else
     {
-      int result = KColorDialog::getColor( color );
+      if ( os.size() == 1 )
+        color = os.front()->drawer()->color();
+      int result = KColorDialog::getColor( color, &w );
       if ( result != KColorDialog::Accepted ) return true;
     }