mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-03-25 01:15:28 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

A few fixes

Browse Source
This commit is contained in:
AlexandreRouma 2022-03-24 16:03:02 +01:00
parent 842b23b2f4
commit 58fcbbc5d2
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
core/src/gui/main_window.cpp
View File

@ -426,14 +426,18 @@ void MainWindow::draw() {
int snrOffset = 87.0f * style::uiScale; int snrOffset = 87.0f * style::uiScale;
int snrWidth = std::clamp<int>(ImGui::GetWindowSize().x - ImGui::GetCursorPosX() - snrOffset, 100.0f * style::uiScale, 300.0f * style::uiScale); int snrWidth = std::clamp<int>(ImGui::GetWindowSize().x - ImGui::GetCursorPosX() - snrOffset, 100.0f * style::uiScale, 300.0f * style::uiScale);
int snrPos = std::max<int>(ImGui::GetWindowSize().x - (snrWidth + snrOffset), ImGui::GetCursorPosX());
ImGui::SetCursorPosX(ImGui::GetWindowSize().x - (snrWidth + snrOffset)); ImGui::SetCursorPosX(snrPos);
ImGui::SetCursorPosY(origY + (5.0f * style::uiScale)); ImGui::SetCursorPosY(origY + (5.0f * style::uiScale));
ImGui::SetNextItemWidth(snrWidth); ImGui::SetNextItemWidth(snrWidth);
ImGui::SNRMeter((vfo != NULL) ? gui::waterfall.selectedVFOSNR : 0); ImGui::SNRMeter((vfo != NULL) ? gui::waterfall.selectedVFOSNR : 0);
// Note: this is what makes the vertical size correct, needs to be fixed
ImGui::SameLine(); ImGui::SameLine();
// ImGui::EndChild();
// Logo button // Logo button
ImGui::SetCursorPosX(ImGui::GetWindowSize().x - (48 * style::uiScale)); ImGui::SetCursorPosX(ImGui::GetWindowSize().x - (48 * style::uiScale));
ImGui::SetCursorPosY(10.0f * style::uiScale); ImGui::SetCursorPosY(10.0f * style::uiScale);
@ -447,8 +451,6 @@ void MainWindow::draw() {
showCredits = false; showCredits = false;
} }
// ImGui::EndChild();
// Handle menu resize // Handle menu resize
ImVec2 winSize = ImGui::GetWindowSize(); ImVec2 winSize = ImGui::GetWindowSize();
ImVec2 mousePos = ImGui::GetMousePos(); ImVec2 mousePos = ImGui::GetMousePos();
@ -485,7 +487,7 @@ void MainWindow::draw() {
if (showMenu) { if (showMenu) {
ImGui::Columns(3, "WindowColumns", false); ImGui::Columns(3, "WindowColumns", false);
ImGui::SetColumnWidth(0, menuWidth); ImGui::SetColumnWidth(0, menuWidth);
ImGui::SetColumnWidth(1, winSize.x - menuWidth - (60.0f * style::uiScale)); ImGui::SetColumnWidth(1, std::max<int>(winSize.x - menuWidth - (60.0f * style::uiScale), 100.0f * style::uiScale));
ImGui::SetColumnWidth(2, 60.0f * style::uiScale); ImGui::SetColumnWidth(2, 60.0f * style::uiScale);
ImGui::BeginChild("Left Column"); ImGui::BeginChild("Left Column");