[Emerge-svn] SF.net SVN: emerge: [1359] trunk/Source/emergeSchemeEngine

[<ir0...@us...>]

Revision: 1359
          http://emerge.svn.sourceforge.net/emerge/?rev=1359&view=rev
Author:   ir0nh34d
Date:     2007-07-22 19:31:11 -0700 (Sun, 22 Jul 2007)

Log Message:
-----------
Implemented 'Switch' button for gradient colours

Modified Paths:
--------------
    trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
    trunk/Source/emergeSchemeEngine/SchemeEditor.h
    trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
    trunk/Source/emergeSchemeEngine/resource.h

Modified: trunk/Source/emergeSchemeEngine/SchemeEditor.cpp
===================================================================
--- trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-07-22 16:17:04 UTC (rev 1358)
+++ trunk/Source/emergeSchemeEngine/SchemeEditor.cpp	2007-07-23 02:31:11 UTC (rev 1359)
@@ -257,6 +257,8 @@
       return TRUE;
     case IDC_LOAD:
       return DoLoad(hwndDlg);
+    case IDC_SWITCH:
+      return DoSwitch(hwndDlg);
     case IDC_BACKGROUNDCOLOUR:
       if (DoColourChooser(&colourBackground))
         {
@@ -324,8 +326,8 @@
             DeleteObject(hbmColourBorder);
           hbmColourBorder = EGCreateBitmap(0xff, colourBorder, colourRect);
           if (hbmColourBorder)
-            DeleteObject((HBITMAP)SendDlgItemMessage(hwndDlg, IDC_BORDERCOLOUR, BM_SETIMAGE, IMAGE_BITMAP,
-                         (LPARAM)hbmColourBorder));
+            DeleteObject((HBITMAP)SendDlgItemMessage(hwndDlg, IDC_BORDERCOLOUR, BM_SETIMAGE,
+                                                     IMAGE_BITMAP, (LPARAM)hbmColourBorder));
           return TRUE;
         }
       return FALSE;
@@ -336,8 +338,8 @@
             DeleteObject(hbmColourFrom);
           hbmColourFrom = EGCreateBitmap(0xff, colourFrom, colourRect);
           if (hbmColourFont)
-            DeleteObject((HBITMAP)SendDlgItemMessage(hwndDlg, IDC_FROMCOLOUR, BM_SETIMAGE, IMAGE_BITMAP,
-                         (LPARAM)hbmColourFrom));
+            DeleteObject((HBITMAP)SendDlgItemMessage(hwndDlg, IDC_FROMCOLOUR, BM_SETIMAGE,
+                                                     IMAGE_BITMAP, (LPARAM)hbmColourFrom));
           return TRUE;
         }
       return FALSE;
@@ -363,6 +365,28 @@
   return FALSE;
 }
 
+BOOL SchemeEditor::DoSwitch(HWND hwndDlg)
+{
+  COLORREF colourTmp = colourFrom;
+  colourFrom = colourTo;
+  colourTo = colourTmp;
+
+  if (hbmColourFrom)
+    DeleteObject(hbmColourFrom);
+  hbmColourFrom = EGCreateBitmap(0xff, colourFrom, colourRect);
+  if (hbmColourFont)
+    DeleteObject((HBITMAP)SendDlgItemMessage(hwndDlg, IDC_FROMCOLOUR, BM_SETIMAGE,
+                                             IMAGE_BITMAP, (LPARAM)hbmColourFrom));
+
+  if (hbmColourTo)
+    DeleteObject(hbmColourTo);
+  hbmColourTo = EGCreateBitmap(0xff, colourTo, colourRect);
+  if (hbmColourTo)
+    DeleteObject((HBITMAP)SendDlgItemMessage(hwndDlg, IDC_TOCOLOUR, BM_SETIMAGE,
+                                             IMAGE_BITMAP, (LPARAM)hbmColourTo));
+  return TRUE;
+}
+
 BOOL SchemeEditor::DoLoad(HWND hwndDlg)
 {
   OPENFILENAME ofn;

Modified: trunk/Source/emergeSchemeEngine/SchemeEditor.h
===================================================================
--- trunk/Source/emergeSchemeEngine/SchemeEditor.h	2007-07-22 16:17:04 UTC (rev 1358)
+++ trunk/Source/emergeSchemeEngine/SchemeEditor.h	2007-07-23 02:31:11 UTC (rev 1359)
@@ -46,6 +46,7 @@
     BOOL DoNotify(HWND hwndDlg, LPARAM lParam);
     BOOL DoColourChooser(COLORREF *colour);
     BOOL DoLoad(HWND hwndDlg);
+    BOOL DoSwitch(HWND hwndDlg);
     void DoSaveAs(HWND hwndDlg);
 
   private:

Modified: trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc
===================================================================
--- trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-22 16:17:04 UTC (rev 1358)
+++ trunk/Source/emergeSchemeEngine/emergeSchemeEngine.rc	2007-07-23 02:31:11 UTC (rev 1359)
@@ -102,10 +102,11 @@
 	CONTROL	"Flat",IDC_FLAT,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,200,235,40,10
 	CONTROL	"Raised",IDC_RAISED,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,240,235,40,10
 	CONTROL	"Sunken",IDC_SUNKEN,"Button",BS_AUTORADIOBUTTON|WS_TABSTOP,280,235,40,10
-  LTEXT "From Color:",IDC_STATIC,80,254,40,8
-	PUSHBUTTON	"",IDC_FROMCOLOUR,120,250,16,16,BS_BITMAP|BS_FLAT
-  LTEXT "To Color:",IDC_STATIC,185,254,40,8
-	PUSHBUTTON	"",IDC_TOCOLOUR,225,250,16,16,BS_BITMAP|BS_FLAT
+  LTEXT "From Color:",IDC_STATIC,50,254,40,8
+	PUSHBUTTON	"",IDC_FROMCOLOUR,90,250,16,16,BS_BITMAP|BS_FLAT
+  PUSHBUTTON  "Switch",IDC_SWITCH,135,251,60,14
+  LTEXT "To Color:",IDC_STATIC,215,254,40,8
+	PUSHBUTTON	"",IDC_TOCOLOUR,255,250,16,16,BS_BITMAP|BS_FLAT
 
   PUSHBUTTON  "Preview",IDC_PREVIEW,5,280,60,14
   PUSHBUTTON  "OK",IDOK,200,280,60,14

Modified: trunk/Source/emergeSchemeEngine/resource.h
===================================================================
--- trunk/Source/emergeSchemeEngine/resource.h	2007-07-22 16:17:04 UTC (rev 1358)
+++ trunk/Source/emergeSchemeEngine/resource.h	2007-07-23 02:31:11 UTC (rev 1359)
@@ -49,3 +49,4 @@
 #define IDC_SUNKEN              504
 #define IDC_FROMCOLOUR          505
 #define IDC_TOCOLOUR            506
+#define IDC_SWITCH              507


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.