m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

X & Y labels disappearing (issue 67) should be fixed.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@412 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Franck Charlet 2008-12-23 19:35:49 +00:00
parent 7247b83007
commit ad465d6073
6 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Grafx2.xcodeproj/xx.pbxuser
View File

@ -165,8 +165,8 @@
PBXFileDataSource_Warnings_ColumnID, PBXFileDataSource_Warnings_ColumnID,
); );
}; };
PBXPerProjectTemplateStateSaveDate = 251316027; PBXPerProjectTemplateStateSaveDate = 251751937;
PBXWorkspaceStateSaveDate = 251316027; PBXWorkspaceStateSaveDate = 251751937;
}; };
sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */; sourceControlManager = F5B19B690EA4BD79003F4BA4 /* Source Control */;
userBuildSettings = { userBuildSettings = {

41
Grafx2.xcodeproj/xx.perspective
View File

@ -222,6 +222,8 @@
<key>Layout</key> <key>Layout</key>
<array> <array>
<dict> <dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key> <key>ContentConfiguration</key>
<dict> <dict>
<key>PBXBottomSmartGroupGIDs</key> <key>PBXBottomSmartGroupGIDs</key>
@ -259,21 +261,18 @@
<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key> <key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
<array> <array>
<string>29B97314FDCFA39411CA2CEA</string> <string>29B97314FDCFA39411CA2CEA</string>
<string>F5AE83FC0ECF8FD300200704</string>
<string>1C37FBAC04509CD000000102</string> <string>1C37FBAC04509CD000000102</string>
<string>F5AE6EC90EDA116A000CE0EF</string>
<string>F5AE6FA80EDA1557000CE0EF</string>
<string>F5AE6FA90EDA1557000CE0EF</string>
<string>1C08E77C0454961000C914BD</string> <string>1C08E77C0454961000C914BD</string>
</array> </array>
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array> <array>
<array> <array>
<integer>9</integer>
<integer>0</integer> <integer>0</integer>
</array> </array>
</array> </array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 778}, {305, 536}}</string> <string>{{0, 0}, {305, 536}}</string>
</dict> </dict>
<key>PBXTopSmartGroupGIDs</key> <key>PBXTopSmartGroupGIDs</key>
<array/> <array/>
@ -290,7 +289,7 @@
<real>305</real> <real>305</real>
</array> </array>
<key>RubberWindowFrame</key> <key>RubberWindowFrame</key>
<string>81 61 953 595 0 0 1024 746 </string> <string>18 77 953 595 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXSmartGroupTreeModule</string> <string>PBXSmartGroupTreeModule</string>
@ -329,7 +328,7 @@
<key>Frame</key> <key>Frame</key>
<string>{{0, 0}, {626, 0}}</string> <string>{{0, 0}, {626, 0}}</string>
<key>RubberWindowFrame</key> <key>RubberWindowFrame</key>
<string>81 61 953 595 0 0 1024 746 </string> <string>18 77 953 595 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXNavigatorGroup</string> <string>PBXNavigatorGroup</string>
@ -342,8 +341,6 @@
<key>Tabs</key> <key>Tabs</key>
<array> <array>
<dict> <dict>
<key>BecomeActive</key>
<true/>
<key>ContentConfiguration</key> <key>ContentConfiguration</key>
<dict> <dict>
<key>PBXProjectModuleGUID</key> <key>PBXProjectModuleGUID</key>
@ -356,7 +353,7 @@
<key>Frame</key> <key>Frame</key>
<string>{{10, 27}, {626, 522}}</string> <string>{{10, 27}, {626, 522}}</string>
<key>RubberWindowFrame</key> <key>RubberWindowFrame</key>
<string>81 61 953 595 0 0 1024 746 </string> <string>18 77 953 595 0 0 1024 746 </string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>XCDetailModule</string> <string>XCDetailModule</string>
@ -415,11 +412,11 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>F5AE6FAA0EDA1557000CE0EF</string> <string>F5AD5DDF0EFFAD7400C9C419</string>
<string>1CA23ED40692098700951B8B</string> <string>1CA23ED40692098700951B8B</string>
<string>F5AE6FAB0EDA1557000CE0EF</string> <string>F5AD5DE00EFFAD7400C9C419</string>
<string>F5A33EBD0EC89C3000F8052D</string> <string>F5A33EBD0EC89C3000F8052D</string>
<string>F5AE6FAC0EDA1557000CE0EF</string> <string>F5AD5DE10EFFAD7400C9C419</string>
<string>1CA23EDF0692099D00951B8B</string> <string>1CA23EDF0692099D00951B8B</string>
<string>1CA23EE00692099D00951B8B</string> <string>1CA23EE00692099D00951B8B</string>
<string>1CA23EE10692099D00951B8B</string> <string>1CA23EE10692099D00951B8B</string>
@ -485,7 +482,7 @@
</array> </array>
</array> </array>
<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
<string>{{0, 0}, {123, 536}}</string> <string>{{0, 0}, {0, 0}}</string>
</dict> </dict>
<key>PBXTopSmartGroupGIDs</key> <key>PBXTopSmartGroupGIDs</key>
<array/> <array/>
@ -546,7 +543,7 @@
</dict> </dict>
<dict> <dict>
<key>Proportion</key> <key>Proportion</key>
<string>549pt</string> <string>0pt</string>
<key>Tabs</key> <key>Tabs</key>
<array> <array>
<dict> <dict>
@ -564,7 +561,7 @@
<key>GeometryConfiguration</key> <key>GeometryConfiguration</key>
<dict> <dict>
<key>Frame</key> <key>Frame</key>
<string>{{10, 27}, {808, 522}}</string> <string>{{10, 27}, {0, -27}}</string>
</dict> </dict>
<key>Module</key> <key>Module</key>
<string>PBXBuildResultsModule</string> <string>PBXBuildResultsModule</string>
@ -626,7 +623,7 @@
</dict> </dict>
</array> </array>
<key>Proportion</key> <key>Proportion</key>
<string>808pt</string> <string>0pt</string>
</dict> </dict>
</array> </array>
<key>Name</key> <key>Name</key>
@ -644,14 +641,14 @@
</array> </array>
<key>TableOfContents</key> <key>TableOfContents</key>
<array> <array>
<string>F5AE6FAD0EDA1557000CE0EF</string> <string>F5AD5DE20EFFAD7400C9C419</string>
<string>1CA23EE50692099D00951B8B</string> <string>1CA23EE50692099D00951B8B</string>
<string>F5AE6FAE0EDA1557000CE0EF</string> <string>F5AD5DE30EFFAD7400C9C419</string>
<string>F5A33EC20EC89C3000F8052D</string> <string>F5A33EC20EC89C3000F8052D</string>
<string>F5AE6FAF0EDA1557000CE0EF</string> <string>F5AD5DE40EFFAD7400C9C419</string>
<string>XCMainBuildResultsModuleGUID</string> <string>XCMainBuildResultsModuleGUID</string>
<string>1CA23EE80692099D00951B8B</string> <string>1CA23EE80692099D00951B8B</string>
<string>F5AE6FB00EDA1557000CE0EF</string> <string>F5AD5DE50EFFAD7400C9C419</string>
</array> </array>
<key>ToolbarConfiguration</key> <key>ToolbarConfiguration</key>
<string>xcode.toolbar.config.buildAndRun</string> <string>xcode.toolbar.config.buildAndRun</string>
@ -825,7 +822,7 @@
<string>/Users/xx/Grafx2/Grafx2.xcodeproj</string> <string>/Users/xx/Grafx2/Grafx2.xcodeproj</string>
</array> </array>
<key>WindowString</key> <key>WindowString</key>
<string>81 61 953 595 0 0 1024 746 </string> <string>18 77 953 595 0 0 1024 746 </string>
<key>WindowTools</key> <key>WindowTools</key>
<array> <array>
<dict> <dict>

4
SFont.h
View File

@ -33,8 +33,8 @@
* contact me, if you problem isn' addressed anywhere. * * contact me, if you problem isn' addressed anywhere. *
* * * *
************************************************************************/ ************************************************************************/
#ifndef SFONT_H #ifndef _SFONT_H_
#define SFONT_H #define _SFONT_H_
#include <SDL/SDL.h> #include <SDL/SDL.h>

4
brush.h
View File

@ -19,8 +19,8 @@
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifndef __BRUSHH__ #ifndef __BRUSH_H_
#define __BRUSHH__ #define __BRUSH_H_
void Capturer_brosse(short Debut_X,short Debut_Y,short Fin_X,short Fin_Y,short Effacement); void Capturer_brosse(short Debut_X,short Debut_Y,short Fin_X,short Fin_Y,short Effacement);
void Rotate_90_deg(void); void Rotate_90_deg(void);

16
moteur.c
View File

@ -39,6 +39,10 @@
#include "windows.h" #include "windows.h"
#include "brush.h" #include "brush.h"
// we need this as global
static short Old_MX=0;
static short Old_MY=0;
//---------- Annuler les effets des modes de dessin (sauf la grille) --------- //---------- Annuler les effets des modes de dessin (sauf la grille) ---------
// Variables mémorisants les anciens effets // Variables mémorisants les anciens effets
@ -473,8 +477,6 @@ void Deplacer_Split(void)
void Gestion_principale(void) void Gestion_principale(void)
{ {
static byte Temp_color; static byte Temp_color;
static short Old_MX=0;
static short Old_MY=0;
int Indice_bouton; // Numéro de bouton de menu en cours int Indice_bouton; // Numéro de bouton de menu en cours
int Indice_bouton_precedent=0; // Numéro de bouton de menu sur lequel on était précédemment int Indice_bouton_precedent=0; // Numéro de bouton de menu sur lequel on était précédemment
byte Blink; // L'opération demande un effacement du curseur byte Blink; // L'opération demande un effacement du curseur
@ -947,12 +949,15 @@ void Gestion_principale(void)
else else
if (Loupe_Mode) Deplacer_Split(); if (Loupe_Mode) Deplacer_Split();
} }
Old_MX=Mouse_X;
Old_MY=Mouse_Y;
} }
else else
{ {
// Le curseur se trouve dans l'image // Le curseur se trouve dans l'image
if ( (Curseur_dans_menu_precedent) && (Menu_visible) && (Old_MY != Mouse_Y || Old_MX != Mouse_X)) // On ne met les coordonnées à jour que si la souris a bougé. Problème, ça va merder si on scroll l'écran...
if ( (Curseur_dans_menu_precedent) && (Menu_visible) && Old_MY!=Mouse_Y && Old_MX != Mouse_X) // On ne met les coordonnées à jour que si la souris a bougé. Problème, ça va merder si on scroll l'écran...
{ {
if ( (Operation_en_cours!=OPERATION_PIPETTE) if ( (Operation_en_cours!=OPERATION_PIPETTE)
&& (Operation_en_cours!=OPERATION_REMPLACER) ) && (Operation_en_cours!=OPERATION_REMPLACER) )
@ -1115,6 +1120,9 @@ void Fermer_fenetre(void)
Touche=0; Touche=0;
Mouse_K=0; Mouse_K=0;
Old_MX = -1;
Old_MY = -1;
Fenetre--; Fenetre--;

4
windows.h
View File

@ -19,8 +19,8 @@
59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/ */
#ifndef __WINDOWSH__ #ifndef __WINDOWS_H_
#define __WINDOWSH__ #define __WINDOWS_H_
#include "struct.h" #include "struct.h"