fix drag and toggle run

Author: LoSealL

meteor/ui/behaviour.cc

@@ -182,7 +182,7 @@ void ImageViewerBehave(Env *e, core::Renderer *r, const ImageViewerInfo &info,
     } catch (...) {
     }
   }
-  if (info.toggle_jump | info.toggle_next | info.toggle_prev) {
+  if (info.toggle_jump | info.toggle_next | info.toggle_prev | info.toggle_run) {
     if (g_loader) {
       g_loader->Seekg(info.frame_num);
       auto data = g_loader->ReadF();

meteor/ui/image_viewer.cc

@@ -1,3 +1,4 @@
+#include <algorithm>
 #include "meteor/ui/ui_window.h"
 
 extern std::string OnButtonOpenFile();
@@ -29,6 +30,15 @@ ImageViewerInfo ImageViewer(const ImageViewerArgs &args) {
   ImGui::SameLine();
   ImGui::LabelText("Path", "%s", ret_info.path.c_str());
   ImGui::PopItemWidth();
+  ImGui::SameLine();
+  ret_info.toggle_reset = ImGui::Button("Reset");
+  if (ret_info.toggle_reset) {
+    ret_info.scale = 1.f;
+    ret_info.image_pos_uv[0] = 0.f;
+    ret_info.image_pos_uv[1] = 0.f;
+    ret_info.image_pos_uv[2] = 1.f;
+    ret_info.image_pos_uv[3] = 1.f;
+  }
   float w3 = ret_info.size.x * 0.113f;
   ImGui::PushItemWidth(w3);
   ret_info.toggle_format_change = false;
@@ -46,7 +56,7 @@ ImageViewerInfo ImageViewer(const ImageViewerArgs &args) {
   ImGui::SameLine();
   ret_info.toggle_refresh = ImGui::InputInt2("Image Size", ret_info.image_size);
   ImGui::SameLine();
-  ret_info.toggle_run = ImGui::Button("R", ImVec2{20, 20});
+  ret_info.toggle_run ^= ImGui::Button("R", ImVec2{20, 20});
   if (ImGui::IsItemHovered()) {
     ImGui::SetTooltip("Run");
   }
@@ -64,6 +74,9 @@ ImageViewerInfo ImageViewer(const ImageViewerArgs &args) {
     if (ret_info.frame_num > 0) ret_info.frame_num--;
   } else if (ret_info.toggle_next) {
     if (ret_info.frame_num < args.max_frame - 1) ret_info.frame_num++;
+  } else if (ret_info.toggle_run) {
+    ret_info.frame_num++;
+    if (ret_info.frame_num >= args.max_frame - 1) ret_info.frame_num = 0;
   }
   ImGui::SameLine();
   ret_info.toggle_jump =
@@ -89,16 +102,18 @@ ImageViewerInfo ImageViewer(const ImageViewerArgs &args) {
       ImGui::BeginTooltip();
       float region_sz = 32.0f;
       float region_x = io.MousePos.x - pos.x - region_sz * 0.5f;
+      float region_y = io.MousePos.y - pos.y - region_sz * 0.5f;
       if (region_x < 0.0f)
         region_x = 0.0f;
       else if (region_x > tex_sz.x - region_sz)
         region_x = tex_sz.x - region_sz;
-      float region_y = io.MousePos.y - pos.y - region_sz * 0.5f;
       if (region_y < 0.0f)
         region_y = 0.0f;
       else if (region_y > tex_sz.y - region_sz)
         region_y = tex_sz.y - region_sz;
       float zoom = 4.0f;
+      region_x += uv0.x * tex_sz.x;
+      region_y += uv0.y * tex_sz.y;
       ImGui::Text("Min: (%.2f, %.2f)", region_x, region_y);
       ImVec2 xy0 = ImVec2((region_x) / tex_sz.x, (region_y) / tex_sz.y);
       ImVec2 xy1 = ImVec2((region_x + region_sz) / tex_sz.x,
@@ -109,21 +124,25 @@ ImageViewerInfo ImageViewer(const ImageViewerArgs &args) {
       ImGui::EndTooltip();
       // use mouse wheel to zoom image
       ret_info.scale += 0.2f * io.MouseWheel;
+      static float dx, dy;
       if (io.MouseDown[0]) {
         // Drag to move
         static ImVec2 prev_uv;
         if (io.MouseClicked[0]) {
           prev_uv = uv0;
         }
-        auto dx = io.MouseClickedPos[0].x - io.MousePos.x;
-        auto dy = io.MouseClickedPos[0].y - io.MousePos.y;
+        dx = io.MouseClickedPos[0].x - io.MousePos.x;
+        dy = io.MouseClickedPos[0].y - io.MousePos.y;
         dx += prev_uv.x * tex_sz.x;
         dy += prev_uv.y * tex_sz.y;
-        ret_info.image_pos_uv[0] = dx / tex_sz.x;
-        ret_info.image_pos_uv[1] = dy / tex_sz.y;
-        ret_info.image_pos_uv[2] = 1 + dx / tex_sz.x;
-        ret_info.image_pos_uv[3] = 1 + dy / tex_sz.y;
       }
+      auto boarder = ImGui::GetWindowSize();
+      dx = std::min(std::max(0.f, dx), std::max(0.f, tex_sz.x - boarder.x));
+      dy = std::min(std::max(0.f, dy), std::max(0.f, tex_sz.y - boarder.y));
+      ret_info.image_pos_uv[0] = dx / tex_sz.x;
+      ret_info.image_pos_uv[1] = dy / tex_sz.y;
+      ret_info.image_pos_uv[2] = 1 + dx / tex_sz.x;
+      ret_info.image_pos_uv[3] = 1 + dy / tex_sz.y;
     }
   }
   ImGui::EndChild();

meteor/ui/ui_window.h

@@ -36,6 +36,7 @@ struct ImageViewerInfo {
   bool toggle_jump;
   bool toggle_refresh;
   bool toggle_format_change;
+  bool toggle_reset;
   std::string path;
   int format_id;
   int image_size[2];