From e22263199f65740e345c92d439e496581cd0a82b Mon Sep 17 00:00:00 2001 From: Peter Repukat Date: Sat, 30 Oct 2021 03:08:47 +0200 Subject: [PATCH] Switch around first ever launch overlay elem positions --- GlosSITarget/HidHide.cpp | 4 ++-- GlosSITarget/Resource.rc | 36 ++++++++++++++++++++++++++++---- GlosSITarget/TargetWindow.cpp | 2 +- GlosSITarget/UWPOverlayEnabler.h | 2 +- 4 files changed, 36 insertions(+), 8 deletions(-) diff --git a/GlosSITarget/HidHide.cpp b/GlosSITarget/HidHide.cpp index 6975d6d..14e15b9 100644 --- a/GlosSITarget/HidHide.cpp +++ b/GlosSITarget/HidHide.cpp @@ -272,8 +272,8 @@ void HidHide::enableOverlayElement() closeCtrlDevice(); overlay_elem_clock_.restart(); } - ImGui::SetNextWindowSizeConstraints({300, 250}, {1000, 1000}); - ImGui::SetNextWindowPos({600, 100}, ImGuiCond_FirstUseEver); + ImGui::SetNextWindowPos({650, 100}, ImGuiCond_FirstUseEver); + ImGui::SetNextWindowSizeConstraints({400, 270}, {1000, 1000}); ImGui::Begin("Hidden Devices"); ImGui::BeginChild("Inner", {0.f, ImGui::GetItemRectSize().y - 64}, true); std::ranges::for_each(avail_devices_, [this](const auto& device) { diff --git a/GlosSITarget/Resource.rc b/GlosSITarget/Resource.rc index 61aa081..4a6bc09 100644 --- a/GlosSITarget/Resource.rc +++ b/GlosSITarget/Resource.rc @@ -51,8 +51,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 0,0,0,6700505 - PRODUCTVERSION 0,0,0,6700505 + FILEVERSION 0,0,0,0032006 + PRODUCTVERSION 0,0,0,0032006 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -69,12 +69,12 @@ BEGIN BEGIN VALUE "CompanyName", "Peter Repukat - FlatspotSoftware" VALUE "FileDescription", "GlosSI - SteamTarget" - VALUE "FileVersion", "0.0.0.67ff5d5" + VALUE "FileVersion", "0.0.0.ce32be6" VALUE "InternalName", "GlosSITarget" VALUE "LegalCopyright", "Copyright (C) 2021 Peter Repukat - FlatspotSoftware" VALUE "OriginalFilename", "GlosSITarget.exe" VALUE "ProductName", "GlosSI" - VALUE "ProductVersion", "0.0.0.67ff5d5" + VALUE "ProductVersion", "0.0.0.ce32be6" END END BLOCK "VarFileInfo" @@ -476,6 +476,34 @@ END + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GlosSITarget/TargetWindow.cpp b/GlosSITarget/TargetWindow.cpp index eb88f16..dd66d07 100644 --- a/GlosSITarget/TargetWindow.cpp +++ b/GlosSITarget/TargetWindow.cpp @@ -48,7 +48,7 @@ TargetWindow::TargetWindow( Overlay::AddOverlayElem([this]() { bool windowed_copy = windowed_; - ImGui::SetNextWindowPos({650, 450}, ImGuiCond_FirstUseEver); + ImGui::SetNextWindowPos({window_.getSize().x - 370.f, 100}, ImGuiCond_FirstUseEver); ImGui::Begin("Window mode"); if (ImGui::Checkbox("Window mode", &windowed_copy)) { toggle_window_mode_after_frame_ = true; diff --git a/GlosSITarget/UWPOverlayEnabler.h b/GlosSITarget/UWPOverlayEnabler.h index f5831f0..9de01af 100644 --- a/GlosSITarget/UWPOverlayEnabler.h +++ b/GlosSITarget/UWPOverlayEnabler.h @@ -39,7 +39,7 @@ inline DWORD ExplorerPid() inline void AddUwpOverlayOvWidget() { Overlay::AddOverlayElem([]() { - ImGui::SetNextWindowPos({950, 100}, ImGuiCond_FirstUseEver); + ImGui::SetNextWindowPos({1200, 250}, ImGuiCond_FirstUseEver); ImGui::SetNextWindowSizeConstraints({170, 225}, {1000, 1000}); ImGui::SetNextWindowCollapsed(true, ImGuiCond_FirstUseEver); ImGui::Begin("UWP-Overlay");