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

Fixed UI and frequency manager bug

Browse Source
This commit is contained in:
Ryzerth 2021-07-02 18:12:56 +02:00
parent 7d720e4d6f
commit 4a2774367f
2 changed files with 29 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -397,9 +397,10 @@ void MainWindow::draw() {
} }
// Handle menu resize // Handle menu resize
float curY = ImGui::GetCursorPosY();
ImVec2 winSize = ImGui::GetWindowSize(); ImVec2 winSize = ImGui::GetWindowSize();
ImVec2 mousePos = ImGui::GetMousePos(); ImVec2 mousePos = ImGui::GetMousePos();
if (!lockWaterfallControls) {
float curY = ImGui::GetCursorPosY();
bool click = ImGui::IsMouseClicked(ImGuiMouseButton_Left); bool click = ImGui::IsMouseClicked(ImGuiMouseButton_Left);
bool down = ImGui::IsMouseDown(ImGuiMouseButton_Left); bool down = ImGui::IsMouseDown(ImGuiMouseButton_Left);
if (grabbingMenu) { if (grabbingMenu) {
@ -423,6 +424,8 @@ void MainWindow::draw() {
core::configManager.conf["menuWidth"] = menuWidth; core::configManager.conf["menuWidth"] = menuWidth;
core::configManager.release(true); core::configManager.release(true);
} }
}
// Left Column // Left Column
lockWaterfallControls = false; lockWaterfallControls = false;

7
radio/src/main.cpp
View File

@ -167,11 +167,12 @@ private:
static void moduleInterfaceHandler(int code, void* in, void* out, void* ctx) { static void moduleInterfaceHandler(int code, void* in, void* out, void* ctx) {
RadioModule* _this = (RadioModule*)ctx; RadioModule* _this = (RadioModule*)ctx;
if (code == RADIO_IFACE_CMD_GET_MODE) { if (code == RADIO_IFACE_CMD_GET_MODE) {
*(int*)out = _this->demodId; int* _out = (int*)out;
*_out = _this->demodId;
} }
else if (code == RADIO_IFACE_CMD_SET_MODE) { else if (code == RADIO_IFACE_CMD_SET_MODE) {
int in = *(int*)in; int* _in = (int*)in;
if (in != _this->demodId) { _this->selectDemodById(in); } if (*_in != _this->demodId) { _this->selectDemodById(*_in); }
} }
} }