Cool_Tools/ImHex
1
0
Fork 0
mirror of synced 2025-02-17 18:59:21 +01:00
Code Releases Wiki Activity

fix: Adjust sidebar items to look better with new layout

Browse Source
This commit is contained in:
WerWolv 2023-12-07 23:47:25 +01:00
parent 5c84ef5f72
commit 470bc8a049
1 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
main/gui/source/window/window.cpp
View File

@ -376,7 +376,7 @@ namespace hex {
}(); }();
const auto menuBarHeight = ImGui::GetCurrentWindow()->MenuBarHeight(); const auto menuBarHeight = ImGui::GetCurrentWindow()->MenuBarHeight();
auto sidebarPos = ImGui::GetCursorPos() + ImVec2(0, menuBarHeight); auto sidebarPos = ImGui::GetCursorPos();
auto sidebarWidth = shouldDrawSidebar ? 20_scaled : 0; auto sidebarWidth = shouldDrawSidebar ? 20_scaled : 0;
ImGui::SetCursorPosX(sidebarWidth); ImGui::SetCursorPosX(sidebarWidth);
@ -439,47 +439,17 @@ namespace hex {
bool open = static_cast<u32>(openWindow) == index; bool open = static_cast<u32>(openWindow) == index;
if (open) { if (open) {
static float width = 200_scaled;
ImGui::SetNextWindowPos(ImGui::GetWindowPos() + sidebarPos + ImVec2(sidebarWidth - 1_scaled, -1_scaled)); ImGui::SetNextWindowPos(ImGui::GetWindowPos() + sidebarPos + ImVec2(sidebarWidth - 1_scaled, -1_scaled));
ImGui::SetNextWindowSize(ImVec2(width, dockSpaceSize.y + 11_scaled - footerHeight)); ImGui::SetNextWindowSize(ImVec2(0, dockSpaceSize.y + 5_scaled));
ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1); ImGui::PushStyleVar(ImGuiStyleVar_WindowBorderSize, 1);
ImGui::PushStyleColor(ImGuiCol_WindowShadow, 0x00000000); ImGui::PushStyleColor(ImGuiCol_WindowShadow, 0x00000000);
if (ImGui::Begin("SideBarWindow", &open, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse)) { if (ImGui::Begin("SideBarWindow", &open, ImGuiWindowFlags_NoMove | ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoTitleBar | ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse)) {
if (ImGui::BeginTable("##Table", 2)) { if (ImGui::BeginChild("##Content", ImVec2(), ImGuiChildFlags_ResizeX)) {
ImGui::TableSetupColumn("Main", ImGuiTableColumnFlags_WidthStretch, 1.0F);
ImGui::TableSetupColumn("Slider", ImGuiTableColumnFlags_WidthFixed, 1);
ImGui::TableNextRow();
ImGui::TableNextColumn();
callback(); callback();
ImGui::TableNextColumn();
static bool dragging = false;
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding, ImVec2(0, 0));
ImGui::Button("##Resize", ImGui::GetContentRegionAvail());
ImGui::PopStyleVar();
if (ImGui::IsMouseDragging(ImGuiMouseButton_Left, 0)) {
if (ImGui::IsItemHovered())
dragging = true;
} else {
dragging = false;
}
if (ImGui::IsItemHovered()) {
ImGui::SetMouseCursor(ImGuiMouseCursor_ResizeEW);
}
if (dragging) {
width += ImGui::GetMouseDragDelta(ImGuiMouseButton_Left, 0).x;
ImGui::ResetMouseDragDelta(ImGuiMouseButton_Left);
}
ImGui::EndTable();
} }
ImGui::EndChild();
if (!ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) && !sideBarFocused) { if (!ImGui::IsWindowFocused(ImGuiFocusedFlags_RootAndChildWindows) && !sideBarFocused) {
openWindow = -1; openWindow = -1;
@ -583,7 +553,7 @@ namespace hex {
if (ImHexApi::Provider::isValid() && isAnyViewOpen()) { if (ImHexApi::Provider::isValid() && isAnyViewOpen()) {
drawList->AddLine( drawList->AddLine(
ImGui::GetWindowPos() + sidebarPos + ImVec2(sidebarWidth - 1_scaled, -2_scaled), ImGui::GetWindowPos() + sidebarPos + ImVec2(sidebarWidth - 1_scaled, -2_scaled),
ImGui::GetWindowPos() + sidebarPos + ImGui::GetWindowSize() - ImVec2(dockSpaceSize.x + 1_scaled, footerHeight - ImGui::GetStyle().FramePadding.y - 1_scaled + menuBarHeight * 2), ImGui::GetWindowPos() + sidebarPos + ImGui::GetWindowSize() - ImVec2(dockSpaceSize.x + 1_scaled, footerHeight - ImGui::GetStyle().FramePadding.y - 1_scaled + menuBarHeight),
ImGui::GetColorU32(ImGuiCol_Separator)); ImGui::GetColorU32(ImGuiCol_Separator));
} }
} }