Skip to content

Commit fff71ed

Browse files
committed
[RFR] : some refactors
1 parent e041b5c commit fff71ed

File tree

3 files changed

+4
-12
lines changed

3 files changed

+4
-12
lines changed

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,5 @@ add_library(ImGuiFileDialog STATIC
1111
target_include_directories(ImGuiFileDialog PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
1212

1313
if(UNIX)
14-
target_compile_options(ImGuiFileDialog PUBLIC "-Wno-unknown-pragmas")
14+
target_compile_options(ImGuiFileDialog PUBLIC -Wno-unknown-pragmas)
1515
endif()

ImGuiFileDialog.cpp

+3-5
Original file line numberDiff line numberDiff line change
@@ -792,14 +792,12 @@ class FileSystemDirent : public IGFD::IFileSystem {
792792

793793
// https://github.com/ocornut/imgui/issues/1720
794794
bool IGFD::Utils::ImSplitter(bool split_vertically, float thickness, float* size1, float* size2, float min_size1, float min_size2, float splitter_long_axis_size) {
795-
using namespace ImGui;
796-
ImGuiContext& g = *GImGui;
797-
ImGuiWindow* window = g.CurrentWindow;
795+
auto* window = ImGui::GetCurrentWindow();
798796
ImGuiID id = window->GetID("##Splitter");
799797
ImRect bb;
800798
bb.Min = window->DC.CursorPos + (split_vertically ? ImVec2(*size1, 0.0f) : ImVec2(0.0f, *size1));
801-
bb.Max = bb.Min + CalcItemSize(split_vertically ? ImVec2(thickness, splitter_long_axis_size) : ImVec2(splitter_long_axis_size, thickness), 0.0f, 0.0f);
802-
return SplitterBehavior(bb, id, split_vertically ? ImGuiAxis_X : ImGuiAxis_Y, size1, size2, min_size1, min_size2, 1.0f, 0.0, ImGui::GetColorU32(ImGuiCol_FrameBg));
799+
bb.Max = bb.Min + ImGui::CalcItemSize(split_vertically ? ImVec2(thickness, splitter_long_axis_size) : ImVec2(splitter_long_axis_size, thickness), 0.0f, 0.0f);
800+
return ImGui::SplitterBehavior(bb, id, split_vertically ? ImGuiAxis_X : ImGuiAxis_Y, size1, size2, min_size1, min_size2, 1.0f, 0.0, ImGui::GetColorU32(ImGuiCol_FrameBg));
803801
}
804802

805803
// Convert a wide Unicode string to an UTF8 string

ImGuiFileDialog.h

-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
#pragma once
22

3-
#if defined(__clang__)
4-
#pragma clang diagnostic ignored "-Wunknown-pragmas"
5-
#elif defined(__GNUC__)
6-
#pragma GCC diagnostic ignored "-Wunknown-pragmas"
7-
#endif
8-
93
#ifdef _MSC_VER
104
#pragma warning(disable : 4251)
115
#endif

0 commit comments

Comments
 (0)