From 08f0541f112f143acd6a81b55ad0f5494cc7807f Mon Sep 17 00:00:00 2001
From: Franck Charlet <hhhikr@gmail.com>
Date: Wed, 22 Oct 2008 03:16:39 +0000
Subject: [PATCH] x-swap and swap should be fixed (i forgot to refresh the main
 palette in such cases).

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@300 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 Grafx2.xcodeproj/xx.pbxuser     | 24 ++++++++++++------------
 Grafx2.xcodeproj/xx.perspective | 14 +++++++-------
 palette.c                       |  2 ++
 3 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser
index 9fe74167..6422f6ca 100644
--- a/Grafx2.xcodeproj/xx.pbxuser
+++ b/Grafx2.xcodeproj/xx.pbxuser
@@ -165,8 +165,8 @@
 					PBXFileDataSource_Warnings_ColumnID,
 				);
 			};
-			PBXPerProjectTemplateStateSaveDate = 246290428;
-			PBXWorkspaceStateSaveDate = 246290428;
+			PBXPerProjectTemplateStateSaveDate = 246337816;
+			PBXWorkspaceStateSaveDate = 246337816;
 		};
 		perUserProjectItems = {
 			F5B19C160EA4D6E8003F4BA4 = F5B19C160EA4D6E8003F4BA4 /* PBXTextBookmark */;
@@ -175,8 +175,8 @@
 			F5B1D1B70EA602BA00AB8D0F = F5B1D1B70EA602BA00AB8D0F /* PBXTextBookmark */;
 			F5B1EEA80EAD15CD00B087B5 = F5B1EEA80EAD15CD00B087B5 /* PBXTextBookmark */;
 			F5B1EEAA0EAD15CD00B087B5 = F5B1EEAA0EAD15CD00B087B5 /* PBXTextBookmark */;
-			F5B1EEBC0EAD20DC00B087B5 = F5B1EEBC0EAD20DC00B087B5 /* PBXTextBookmark */;
-			F5D4B83C0EAD7B9F00BCEF63 = F5D4B83C0EAD7B9F00BCEF63 /* PBXTextBookmark */;
+			F5C3D2770EAE1BA000264A2B = F5C3D2770EAE1BA000264A2B /* PBXTextBookmark */;
+			F5C3D2870EAE1EE800264A2B = F5C3D2870EAE1EE800264A2B /* PBXTextBookmark */;
 		};
 		sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */;
 		userBuildSettings = {
@@ -295,8 +295,8 @@
 	};
 	F5B19B850EA4BE3E003F4BA4 /* palette.c */ = {
 		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {1268, 37202}}";
-			sepNavSelRange = "{75869, 0}";
+			sepNavIntBoundsRect = "{{0, 0}, {1268, 36993}}";
+			sepNavSelRange = "{75128, 0}";
 			sepNavVisRect = "{{0, 0}, {0, 0}}";
 			sepNavWindowFrame = "{{15, 76}, {906, 665}}";
 		};
@@ -384,22 +384,22 @@
 		vrLen = 123;
 		vrLoc = 0;
 	};
-	F5B1EEBC0EAD20DC00B087B5 /* PBXTextBookmark */ = {
+	F5C3D2770EAE1BA000264A2B /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = F5B19B850EA4BE3E003F4BA4 /* palette.c */;
-		name = "palette.c: 1934";
+		name = "palette.c: 1947";
 		rLen = 0;
-		rLoc = 74708;
+		rLoc = 75128;
 		rType = 0;
 		vrLen = 0;
 		vrLoc = 0;
 	};
-	F5D4B83C0EAD7B9F00BCEF63 /* PBXTextBookmark */ = {
+	F5C3D2870EAE1EE800264A2B /* PBXTextBookmark */ = {
 		isa = PBXTextBookmark;
 		fRef = F5B19B850EA4BE3E003F4BA4 /* palette.c */;
-		name = "palette.c: 1958";
+		name = "palette.c: 1947";
 		rLen = 0;
-		rLoc = 75318;
+		rLoc = 75128;
 		rType = 0;
 		vrLen = 0;
 		vrLoc = 0;
diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective
index db9ff661..adcda10a 100644
--- a/Grafx2.xcodeproj/xx.perspective
+++ b/Grafx2.xcodeproj/xx.perspective
@@ -544,13 +544,13 @@
 										<key>_historyCapacity</key>
 										<integer>0</integer>
 										<key>bookmark</key>
-										<string>F5D4B83C0EAD7B9F00BCEF63</string>
+										<string>F5C3D2870EAE1EE800264A2B</string>
 										<key>history</key>
 										<array>
 											<string>F5B19C160EA4D6E8003F4BA4</string>
 											<string>F5B1D1770EA5FE2100AB8D0F</string>
 											<string>F5B1EEA80EAD15CD00B087B5</string>
-											<string>F5B1EEBC0EAD20DC00B087B5</string>
+											<string>F5C3D2770EAE1BA000264A2B</string>
 										</array>
 										<key>prevStack</key>
 										<array>
@@ -590,7 +590,7 @@
 									<key>ContentConfiguration</key>
 									<dict>
 										<key>PBXBuildLogShowsTranscriptDefaultKey</key>
-										<string>{{0, 267}, {696, 148}}</string>
+										<string>{{0, 166}, {696, 249}}</string>
 										<key>PBXProjectModuleGUID</key>
 										<string>XCMainBuildResultsModuleGUID</string>
 										<key>PBXProjectModuleLabel</key>
@@ -685,14 +685,14 @@
 			</array>
 			<key>TableOfContents</key>
 			<array>
-				<string>F5D4B83D0EAD7B9F00BCEF63</string>
+				<string>F5C3D2830EAE1D5C00264A2B</string>
 				<string>1CA23EE50692099D00951B8B</string>
-				<string>F5D4B83E0EAD7B9F00BCEF63</string>
+				<string>F5C3D2840EAE1D5C00264A2B</string>
 				<string>F5B19BA70EA4BF24003F4BA4</string>
-				<string>F5D4B83F0EAD7B9F00BCEF63</string>
+				<string>F5C3D2850EAE1D5C00264A2B</string>
 				<string>XCMainBuildResultsModuleGUID</string>
 				<string>1CA23EE80692099D00951B8B</string>
-				<string>F5D4B8400EAD7B9F00BCEF63</string>
+				<string>F5C3D2860EAE1D5C00264A2B</string>
 			</array>
 			<key>ToolbarConfiguration</key>
 			<string>xcode.toolbar.config.buildAndRun</string>
diff --git a/palette.c b/palette.c
index 453c8a18..d4e0d004 100644
--- a/palette.c
+++ b/palette.c
@@ -1133,6 +1133,8 @@ void Bouton_Palette(void)
 
           Il_faut_remapper=1;
 
+		  Set_palette(Palette_de_travail);
+
           Afficher_curseur();
           Palette_Reafficher_jauges(Jauge_rouge,Jauge_verte,Jauge_bleue,Palette_de_travail,Debut_block,Fin_block);