Home Explore Help
Sign In
c
/
imgui
mirror of https://github.com/ocornut/imgui.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Renamed misleading ImGuiMouseCursor_Move to ImGuiMouseCursor_ResizeAll. SDL: Fixed cursor. (#1626)

omar 7 years ago
parent
ffb6e89f30
commit
7c75835200
5 changed files with 5 additions and 5 deletions
Split View Show Diff Stats
  1. 1 1
      examples/allegro5_example/imgui_impl_a5.cpp
  2. 1 1
      examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
  3. 1 1
      examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
  4. 1 1
      imgui.h
  5. 1 1
      imgui_draw.cpp

+ 1 - 1
examples/allegro5_example/imgui_impl_a5.cpp
View File 

@@ -291,7 +291,7 @@ void ImGui_ImplA5_NewFrame()
 
         switch (ImGui::GetMouseCursor())
 
         {
 
         case ImGuiMouseCursor_TextInput:    cursor_id = ALLEGRO_SYSTEM_MOUSE_CURSOR_EDIT; break;
 
-        case ImGuiMouseCursor_Move:         cursor_id = ALLEGRO_SYSTEM_MOUSE_CURSOR_MOVE; break;
 
+        case ImGuiMouseCursor_ResizeAll:    cursor_id = ALLEGRO_SYSTEM_MOUSE_CURSOR_MOVE; break;
 
         case ImGuiMouseCursor_ResizeNS:     cursor_id = ALLEGRO_SYSTEM_MOUSE_CURSOR_RESIZE_N; break;
 
         case ImGuiMouseCursor_ResizeEW:     cursor_id = ALLEGRO_SYSTEM_MOUSE_CURSOR_RESIZE_E; break;
 
         case ImGuiMouseCursor_ResizeNESW:   cursor_id = ALLEGRO_SYSTEM_MOUSE_CURSOR_RESIZE_NE; break;

+ 1 - 1
examples/sdl_opengl2_example/imgui_impl_sdl_gl2.cpp
View File 

@@ -253,7 +253,7 @@ bool    ImGui_ImplSdlGL2_Init(SDL_Window* window)
 
 
     g_SdlCursorMap[ImGuiMouseCursor_Arrow] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
 
     g_SdlCursorMap[ImGuiMouseCursor_TextInput] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM);
 
-    g_SdlCursorMap[ImGuiMouseCursor_Move] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
 
+    g_SdlCursorMap[ImGuiMouseCursor_ResizeAll] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL);
 
     g_SdlCursorMap[ImGuiMouseCursor_ResizeNS] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS);
 
     g_SdlCursorMap[ImGuiMouseCursor_ResizeEW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE);
 
     g_SdlCursorMap[ImGuiMouseCursor_ResizeNESW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENESW);

+ 1 - 1
examples/sdl_opengl3_example/imgui_impl_sdl_gl3.cpp
View File 

@@ -367,7 +367,7 @@ bool    ImGui_ImplSdlGL3_Init(SDL_Window* window)
 
 
     g_SdlCursorMap[ImGuiMouseCursor_Arrow] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
 
     g_SdlCursorMap[ImGuiMouseCursor_TextInput] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM);
 
-    g_SdlCursorMap[ImGuiMouseCursor_Move] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
 
+    g_SdlCursorMap[ImGuiMouseCursor_ResizeAll] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEALL);
 
     g_SdlCursorMap[ImGuiMouseCursor_ResizeNS] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENS);
 
     g_SdlCursorMap[ImGuiMouseCursor_ResizeEW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZEWE);
 
     g_SdlCursorMap[ImGuiMouseCursor_ResizeNESW] = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_SIZENESW);

+ 1 - 1
imgui.h
View File 

@@ -881,7 +881,7 @@ enum ImGuiMouseCursor_
 
     ImGuiMouseCursor_None = -1,
 
     ImGuiMouseCursor_Arrow = 0,
 
     ImGuiMouseCursor_TextInput,         // When hovering over InputText, etc.
 
-    ImGuiMouseCursor_Move,              // Unused
 
+    ImGuiMouseCursor_ResizeAll,         // Unused
 
     ImGuiMouseCursor_ResizeNS,          // When hovering over an horizontal border
 
     ImGuiMouseCursor_ResizeEW,          // When hovering over a vertical border or a column
 
     ImGuiMouseCursor_ResizeNESW,        // When hovering over the bottom-left corner of a window

+ 1 - 1
imgui_draw.cpp
View File 

@@ -1351,7 +1351,7 @@ static const ImVec2 FONT_ATLAS_DEFAULT_TEX_CURSOR_DATA[ImGuiMouseCursor_Count_][
 
     // Pos ........ Size ......... Offset ......
 
     { ImVec2(0,3),  ImVec2(12,19), ImVec2( 0, 0) }, // ImGuiMouseCursor_Arrow
 
     { ImVec2(13,0), ImVec2(7,16),  ImVec2( 4, 8) }, // ImGuiMouseCursor_TextInput
 
-    { ImVec2(31,0), ImVec2(23,23), ImVec2(11,11) }, // ImGuiMouseCursor_Move
 
+    { ImVec2(31,0), ImVec2(23,23), ImVec2(11,11) }, // ImGuiMouseCursor_ResizeAll
 
     { ImVec2(21,0), ImVec2( 9,23), ImVec2( 5,11) }, // ImGuiMouseCursor_ResizeNS
 
     { ImVec2(55,18),ImVec2(23, 9), ImVec2(11, 5) }, // ImGuiMouseCursor_ResizeEW
 
     { ImVec2(73,0), ImVec2(17,17), ImVec2( 9, 9) }, // ImGuiMouseCursor_ResizeNESW