Browse Source

Originale x und y koordinaten zum mausEreignis hinzugefügt

Kolja Strohm 5 years ago
parent
commit
a1775f9c03
2 changed files with 17 additions and 13 deletions
  1. 13 13
      Fenster.cpp
  2. 4 0
      MausEreignis.h

+ 13 - 13
Fenster.cpp

@@ -85,7 +85,7 @@ LRESULT CALLBACK Framework::WindowProc( HWND hwnd, UINT message, WPARAM wparam,
         if( 1 )
         {
             MausStand[ M_Links ] = 1;
-            MausEreignis me = { ME_PLinks, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_PLinks, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
@@ -93,7 +93,7 @@ LRESULT CALLBACK Framework::WindowProc( HWND hwnd, UINT message, WPARAM wparam,
         if( 1 )
         {
             MausStand[ M_Rechts ] = 1;
-            MausEreignis me = { ME_PRechts, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_PRechts, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
@@ -101,7 +101,7 @@ LRESULT CALLBACK Framework::WindowProc( HWND hwnd, UINT message, WPARAM wparam,
         if( 1 )
         {
             MausStand[ M_Mitte ] = 1;
-            MausEreignis me = { ME_PMitte, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_PMitte, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
@@ -109,7 +109,7 @@ LRESULT CALLBACK Framework::WindowProc( HWND hwnd, UINT message, WPARAM wparam,
         if( 1 )
         {
             MausStand[ M_Links ] = 0;
-            MausEreignis me = { ME_RLinks, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_RLinks, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
@@ -117,7 +117,7 @@ LRESULT CALLBACK Framework::WindowProc( HWND hwnd, UINT message, WPARAM wparam,
         if( 1 )
         {
             MausStand[ M_Rechts ] = 0;
-            MausEreignis me = { ME_RRechts, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_RRechts, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
@@ -125,28 +125,28 @@ LRESULT CALLBACK Framework::WindowProc( HWND hwnd, UINT message, WPARAM wparam,
         if( 1 )
         {
             MausStand[ M_Mitte ] = 0;
-            MausEreignis me = { ME_RMitte, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_RMitte, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
     case WM_LBUTTONDBLCLK: // Linksdoppelklick
         if( 1 )
         {
-            MausEreignis me = { ME_DKLinks, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_DKLinks, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
     case WM_RBUTTONDBLCLK: // Rechtsdoppelklick
         if( 1 )
         {
-            MausEreignis me = { ME_DKRechts, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_DKRechts, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
     case WM_MBUTTONDBLCLK: // Mitteldoppelklick
         if( 1 )
         {
-            MausEreignis me = { ME_DKMitte, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_DKMitte, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
@@ -154,7 +154,7 @@ LRESULT CALLBACK Framework::WindowProc( HWND hwnd, UINT message, WPARAM wparam,
         if( 1 )
         {
             MausTrack = 1;
-            MausEreignis me = { ME_Betritt, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_Betritt, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
@@ -162,7 +162,7 @@ LRESULT CALLBACK Framework::WindowProc( HWND hwnd, UINT message, WPARAM wparam,
         if( 1 )
         {
             MausTrack = 1;
-            MausEreignis me = { ME_Leaves, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1 };
+            MausEreignis me = { ME_Leaves, (int)LOWORD( lparam ), (int)HIWORD( lparam ), 0, 1, (int)LOWORD( lparam ), (int)HIWORD( lparam ) };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
@@ -183,14 +183,14 @@ LRESULT CALLBACK Framework::WindowProc( HWND hwnd, UINT message, WPARAM wparam,
                 TrackMouseEvent( &lptme );
                 MausTrack = 0;
             }
-            MausEreignis me = { ME_Bewegung, mausPos.x, mausPos.y, 0, 1 };
+            MausEreignis me = { ME_Bewegung, mausPos.x, mausPos.y, 0, 1, mausPos.x, mausPos.y };
             WFensterA.sendMausMessage( hwnd, me );
             break;
         }
     case WM_MOUSEWHEEL: // Maus scroll
         if( 1 )
         {
-            MausEreignis me = { 0, mausPos.x, mausPos.y, 0, 1 };
+            MausEreignis me = { 0, mausPos.x, mausPos.y, 0, 1, mausPos.x, mausPos.y };
             if( (int)(short)HIWORD( wparam ) < 0 )
                 me.id = !getTastenStand( T_Shift ) ? ME_DScroll : ME_RScroll;
             else

+ 4 - 0
MausEreignis.h

@@ -39,6 +39,10 @@ namespace Framework
         bool verarbeitet;
         // Speichert, ob sich das mausereignis innerhalb des Objektes befindet, welches dieses Objekt beinhaltet
         bool insideParent;
+        // original X koordinate
+        int originalY;
+        // original Y koordinate
+        int originalX;
     };
 
     // Speichert eine bestimmte Mauseingabe des Nutzers