Merge pull request GLVis#84 from GLVis/f7-fix

Fixed support for the 'F7' key
fengerhan · Mar 21, 2019 · 20aeb2c · 20aeb2c
2 parents 2e9aa75 + a6e64e7
commit 20aeb2c
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/lib/vsdata.cpp b/lib/vsdata.cpp
@@ -879,18 +879,7 @@ void KeyF6Pressed()
 
 void KeyF7Pressed(GLenum state)
 {
-   if (state == 0)
-   {
-      cout << "[minv,maxv] = [" << vsdata->GetMinV() << "," << vsdata->GetMaxV()
-           << "]  maxv-minv = " << vsdata->GetMaxV()-vsdata->GetMinV() << "\n"
-           << "New value for minv: " << flush;
-      cin >> vsdata->GetMinV();
-      cout << "New value for maxv: " << flush;
-      cin >> vsdata->GetMaxV();
-      vsdata->UpdateValueRange(true);
-      SendExposeEvent();
-   }
-   else if (state & ShiftMask)
+   if (state & ShiftMask)
    {
       cout << "Current bounding box:\n"
            << "   min: (" << vsdata->x[0] << ',' << vsdata->y[0] << ','
@@ -918,6 +907,17 @@ void KeyF7Pressed(GLenum state)
       vsdata->UpdateBoundingBox();
       SendExposeEvent();
    }
+   else
+   {
+      cout << "[minv,maxv] = [" << vsdata->GetMinV() << "," << vsdata->GetMaxV()
+           << "]  maxv-minv = " << vsdata->GetMaxV()-vsdata->GetMinV() << "\n"
+           << "New value for minv: " << flush;
+      cin >> vsdata->GetMinV();
+      cout << "New value for maxv: " << flush;
+      cin >> vsdata->GetMaxV();
+      vsdata->UpdateValueRange(true);
+      SendExposeEvent();
+   }
 }
 
 void KeyBackslashPressed()