diff --git a/Grafx2.xcodeproj/xx.pbxuser b/Grafx2.xcodeproj/xx.pbxuser
index 55f0922b..06c23b53 100644
--- a/Grafx2.xcodeproj/xx.pbxuser
+++ b/Grafx2.xcodeproj/xx.pbxuser
@@ -77,7 +77,7 @@
43,
20,
79,
- 71,
+ 110,
);
PBXFileTableDataSourceColumnsKey = (
PBXFileDataSource_FiletypeID,
@@ -165,8 +165,8 @@
PBXFileDataSource_Warnings_ColumnID,
);
};
- PBXPerProjectTemplateStateSaveDate = 251751937;
- PBXWorkspaceStateSaveDate = 251751937;
+ PBXPerProjectTemplateStateSaveDate = 251761415;
+ PBXWorkspaceStateSaveDate = 251761415;
};
sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */;
userBuildSettings = {
diff --git a/Grafx2.xcodeproj/xx.perspective b/Grafx2.xcodeproj/xx.perspective
index 354329d0..5506b2d9 100644
--- a/Grafx2.xcodeproj/xx.perspective
+++ b/Grafx2.xcodeproj/xx.perspective
@@ -222,8 +222,6 @@
Layout
- BecomeActive
-
ContentConfiguration
PBXBottomSmartGroupGIDs
@@ -262,7 +260,6 @@
29B97314FDCFA39411CA2CEA
1C37FBAC04509CD000000102
- 1C08E77C0454961000C914BD
PBXSmartGroupTreeModuleOutlineStateSelectionKey
@@ -272,7 +269,7 @@
PBXSmartGroupTreeModuleOutlineStateVisibleRectKey
- {{0, 0}, {305, 536}}
+ {{0, 0}, {305, 387}}
PBXTopSmartGroupGIDs
@@ -282,14 +279,14 @@
GeometryConfiguration
Frame
- {{0, 0}, {322, 554}}
+ {{0, 0}, {322, 405}}
GroupTreeTableConfiguration
MainColumn
305
RubberWindowFrame
- 18 77 953 595 0 0 1024 746
+ 14 169 992 446 0 0 1024 746
Module
PBXSmartGroupTreeModule
@@ -326,9 +323,9 @@
GeometryConfiguration
Frame
- {{0, 0}, {626, 0}}
+ {{0, 0}, {665, 0}}
RubberWindowFrame
- 18 77 953 595 0 0 1024 746
+ 14 169 992 446 0 0 1024 746
Module
PBXNavigatorGroup
@@ -337,10 +334,12 @@
Proportion
- 549pt
+ 400pt
Tabs
+ BecomeActive
+
ContentConfiguration
PBXProjectModuleGUID
@@ -351,9 +350,9 @@
GeometryConfiguration
Frame
- {{10, 27}, {626, 522}}
+ {{10, 27}, {665, 373}}
RubberWindowFrame
- 18 77 953 595 0 0 1024 746
+ 14 169 992 446 0 0 1024 746
Module
XCDetailModule
@@ -394,7 +393,7 @@
Proportion
- 626pt
+ 665pt
Name
@@ -412,11 +411,11 @@
TableOfContents
- F5AD5DDF0EFFAD7400C9C419
+ F5ADFF250F0180EF0008467A
1CA23ED40692098700951B8B
- F5AD5DE00EFFAD7400C9C419
+ F5ADFF260F0180EF0008467A
F5A33EBD0EC89C3000F8052D
- F5AD5DE10EFFAD7400C9C419
+ F5ADFF270F0180EF0008467A
1CA23EDF0692099D00951B8B
1CA23EE00692099D00951B8B
1CA23EE10692099D00951B8B
@@ -641,14 +640,14 @@
TableOfContents
- F5AD5DE20EFFAD7400C9C419
+ F5ADFF280F0180EF0008467A
1CA23EE50692099D00951B8B
- F5AD5DE30EFFAD7400C9C419
+ F5ADFF290F0180EF0008467A
F5A33EC20EC89C3000F8052D
- F5AD5DE40EFFAD7400C9C419
+ F5ADFF2A0F0180EF0008467A
XCMainBuildResultsModuleGUID
1CA23EE80692099D00951B8B
- F5AD5DE50EFFAD7400C9C419
+ F5ADFF2B0F0180EF0008467A
ToolbarConfiguration
xcode.toolbar.config.buildAndRun
@@ -822,7 +821,7 @@
/Users/xx/Grafx2/Grafx2.xcodeproj
WindowString
- 18 77 953 595 0 0 1024 746
+ 14 169 992 446 0 0 1024 746
WindowTools
diff --git a/boutons.c b/boutons.c
index d6844d7d..db6157fc 100644
--- a/boutons.c
+++ b/boutons.c
@@ -61,6 +61,9 @@
#define Display_Window(X,Y) UpdateRect(Fenetre_Pos_X,Fenetre_Pos_Y,X*Menu_Facteur_X,Y*Menu_Facteur_Y);
+extern short Old_MX;
+extern short Old_MY;
+
//-- MODELE DE BOUTON DE MENU ------------------------------------------------
/*
@@ -3895,6 +3898,9 @@ void Bouton_desenclencher_Loupe(void)
Afficher_ecran(); // <=> Display_screen();
// Repositionner le curseur en fonction des coordonnées visibles
Calculer_coordonnees_pinceau();
+
+ Old_MX = -1;
+ Old_MY = -1;
}
else // On fait de notre mieux pour restaurer l'ancienne opération:
Demarrer_pile_operation(Operation_avant_interruption);
diff --git a/moteur.c b/moteur.c
index f000dcdf..d80c4992 100644
--- a/moteur.c
+++ b/moteur.c
@@ -40,8 +40,8 @@
#include "brush.h"
// we need this as global
-static short Old_MX=0;
-static short Old_MY=0;
+short Old_MX = -1;
+short Old_MY = -1;
//---------- Annuler les effets des modes de dessin (sauf la grille) ---------