mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2024-11-12 21:42:51 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix waterfall size related crash described in #1230

Browse Source
This commit is contained in:
AlexandreRouma 2024-04-10 18:28:59 +02:00
parent a2d49b2f87
commit e118598f57
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
core/src/gui/widgets/waterfall.cpp
View File

@ -717,18 +717,23 @@ namespace ImGui {
void WaterFall::onResize() { void WaterFall::onResize() {
std::lock_guard<std::recursive_mutex> lck(latestFFTMtx); std::lock_guard<std::recursive_mutex> lck(latestFFTMtx);
std::lock_guard<std::mutex> lck2(smoothingBufMtx); std::lock_guard<std::mutex> lck2(smoothingBufMtx);
// return if widget is too small
if (widgetSize.x < 100 || widgetSize.y < 100) {
return;
}
// Check if the size is valid. This is because some settings might be changed before being first displayed.
if (widgetSize.x < 1.0f || widgetSize.y < 1.0f) { return; }
// Set a minimim size
widgetSize.x = std::max<float>(widgetSize.x, 100.0f*style::uiScale);
widgetSize.y = std::max<float>(widgetSize.y, 100.0f*style::uiScale);
// Save last height
int lastWaterfallHeight = waterfallHeight; int lastWaterfallHeight = waterfallHeight;
// Compute sizes
if (waterfallVisible) { if (waterfallVisible) {
FFTAreaHeight = std::min<int>(FFTAreaHeight, widgetSize.y - (50.0f * style::uiScale)); FFTAreaHeight = std::min<int>(FFTAreaHeight, widgetSize.y - (50.0f * style::uiScale));
newFFTAreaHeight = FFTAreaHeight; newFFTAreaHeight = FFTAreaHeight;
fftHeight = FFTAreaHeight - (50.0f * style::uiScale); fftHeight = FFTAreaHeight - (50.0f * style::uiScale);
waterfallHeight = widgetSize.y - fftHeight - (50.0f * style::uiScale) - 2; waterfallHeight = std::max<int>(1, widgetSize.y - fftHeight - (50.0f * style::uiScale) - 2);
} }
else { else {
fftHeight = widgetSize.y - (50.0f * style::uiScale); fftHeight = widgetSize.y - (50.0f * style::uiScale);