Changeset 2530 in Sophya

Timestamp:

Apr 28, 2004, 12:13:29 PM (21 years ago)

Author:

ansari

Message:

Amelioration gestion highlight des PIDrawers - Reza 28/4/2004

Location:

trunk/SophyaPI/PI

Files:

• pidrawer.cc (modified) (3 diffs)
• pidrawer.h (modified) (1 diff)
• pimenux.cc (modified) (2 diffs)
• piscdrawwdg.cc (modified) (3 diffs)

trunk/SophyaPI/PI/pidrawer.cc

@@ -68 +68 @@
   mDndfg = false;  // Pour controle de l'appel de Detach() si delete
 
-  mFgHighLight = false;  // Flag de control d'affichage en mode HighLight
+  lastHLStatus = mFgHighLight = false;  // Flag de control d'affichage en mode HighLight
 
 
@@ -238 +238 @@
 PIDrawer::HighLight(bool fgh)
 {
-  mFgHighLight = fgh;
+  if (lastHLStatus == fgh)  return; 
+  lastHLStatus = mFgHighLight = fgh;
   Refresh();
   mFgHighLight = false;
@@ -459 +460 @@
     mGrUC->SelForeground(PI_HighlightBlue);
     mGrUC->LockForegroundColor();
+    lastHLStatus = true;
   }
+  else lastHLStatus = false;
   
   return(mGrUC);

trunk/SophyaPI/PI/pidrawer.h

@@ -131 +131 @@
   PIGraphicUC* mGrUC;
 
-// Flag de control d'affichage en mode HighLight
-  bool mFgHighLight;
+// Flag de control d'affichage en mode HighLight, dernier etat highlight ou non
+  bool mFgHighLight, lastHLStatus;
 // Flag indiquant s'il y a une fenetre de controle specifique
   bool mFgSpecContWind;

trunk/SophyaPI/PI/pimenux.cc

@@ -476 +476 @@
 evt.display = dsp;
 evt.window = sw;
+evt.subwindow = None;
 evt.root = rw;
 evt.x_root = xr;
@@ -482 +483 @@
 evt.y = py;
 evt.serial = PIXGetLastEventSerial(); 
-evt.time = PIXGetLastEventTime();
+// evt.time = PIXGetLastEventTime();
+PIXGetLastEventInfo(evt.state, evt.time);
+evt.button = 1;
+// evt.state = 0;
 evt.send_event = False;
 evt.same_screen = True;
+cout << " XmMenuPosition-DBG xr,yr= " << xr << "," << yr 
+     << " x,y=" << px << "," << py << endl;
 XmMenuPosition(XtWdg(), &evt);
 // SetPos(xr, yr);

trunk/SophyaPI/PI/piscdrawwdg.cc

@@ -428 +428 @@
     int nid = FindNearestDrawerId(x,y);
     SetActiveDrawerId(nid);
-//    PIDrawer*  actdr = GetActiveDrawer();
-//    if (actdr) { 
-//      actdr->HighLight(true);
-//    }
+    PIDrawer*  actdr = GetActiveDrawer();
+    if (actdr) { 
+      actdr->HighLight(true);
+      if (mDrwMen) delete mDrwMen;
+      mDrwMen = new PIDrwMgrMenu(this);
+      mDrwMen->Show(this, x, y);
+    }
     return;
   }
@@ -474 +477 @@
   if (mFgShiftBut) {  //SetActive Drawer on Shift-Button-1
     mFgShiftBut = false; 
+    /*
     PIDrawer*  actdr = GetActiveDrawer();
     if (actdr) { 
@@ -481 +485 @@
       mDrwMen->Show();
     }
-
+    */
     return;
   }