From be5fb4dccfa856f0a354ad05f63eeabb26b6c9af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20S=C3=BC=C3=9Fkind?= Date: Thu, 12 Apr 2018 14:23:47 +0200 Subject: [PATCH 1/4] Context menu bug fix --- OSCWidgets/ToyGrid.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/OSCWidgets/ToyGrid.cpp b/OSCWidgets/ToyGrid.cpp index 0db88f6..d25e566 100644 --- a/OSCWidgets/ToyGrid.cpp +++ b/OSCWidgets/ToyGrid.cpp @@ -895,7 +895,6 @@ void ToyGrid::resizeEvent(QResizeEvent *event) void ToyGrid::contextMenuEvent(QContextMenuEvent *event) { QString name; - GetName(name); QMenu menu(this); @@ -942,6 +941,8 @@ void ToyGrid::contextMenuEvent(QContextMenuEvent *event) menu.addMenu(gridSizeMenu); } + GetName(name); + if( hasLayoutMode ) menu.addAction(QIcon(":/assets/images/MenuIconSettings.png"), tr("Layout Mode..."), this, SLOT(onLayoutMode())); else From d6aff6119175fe692d115d3c614ecd7ac8757c4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20S=C3=BC=C3=9Fkind?= Date: Tue, 17 Apr 2018 15:18:37 +0200 Subject: [PATCH 2/4] The LogFile thread no longer consumes all CPU cycles --- OSCWidgets/LogFile.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/OSCWidgets/LogFile.cpp b/OSCWidgets/LogFile.cpp index 5ff654d..d7e3d89 100644 --- a/OSCWidgets/LogFile.cpp +++ b/OSCWidgets/LogFile.cpp @@ -127,6 +127,8 @@ void LogFile::run() break; stream.flush(); + + msleep(100); } stream.flush(); From ec3aabb565d460b4db0ea05f994202cc40eb879c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20S=C3=BC=C3=9Fkind?= Date: Wed, 23 May 2018 12:55:15 +0200 Subject: [PATCH 3/4] Fixed some 'enumeration value not handled in switch' warnings (Qt 5.6.3, MinGW 4.9.2) --- OSCWidgets/FadeButton.cpp | 3 +++ OSCWidgets/LogWidget.cpp | 3 +++ OSCWidgets/ToyActivity.cpp | 9 +++++++++ OSCWidgets/ToyPedal.cpp | 3 +++ OSCWidgets/ToyWindow.cpp | 3 +++ 5 files changed, 21 insertions(+) diff --git a/OSCWidgets/FadeButton.cpp b/OSCWidgets/FadeButton.cpp index 064aeec..296a164 100644 --- a/OSCWidgets/FadeButton.cpp +++ b/OSCWidgets/FadeButton.cpp @@ -448,6 +448,9 @@ bool FadeButton::event(QEvent *event) event->accept(); } return true; + + default: + break; } } diff --git a/OSCWidgets/LogWidget.cpp b/OSCWidgets/LogWidget.cpp index 29d00b8..167116f 100644 --- a/OSCWidgets/LogWidget.cpp +++ b/OSCWidgets/LogWidget.cpp @@ -217,6 +217,9 @@ bool LogWidget::event(QEvent *event) case QEvent::FontChange: UpdateFont(); break; + + default: + break; } return QWidget::event(event); diff --git a/OSCWidgets/ToyActivity.cpp b/OSCWidgets/ToyActivity.cpp index 344a2d7..7949220 100644 --- a/OSCWidgets/ToyActivity.cpp +++ b/OSCWidgets/ToyActivity.cpp @@ -118,6 +118,9 @@ void FadeActivity::SetOn(bool b) case FADE_OUT: onUpdate(); break; + + default: + break; } } } @@ -144,6 +147,9 @@ float FadeActivity::GetFadeOpacity() const case FADE_OUT: return (1.0f - GetFadePercent()); + + default: + break; } return 0; @@ -165,6 +171,9 @@ float FadeActivity::GetFadePercent() const case FADE_OUT: return ((m_FadeTiming.out==0) ? 1.0f : (m_FadeElapsed/static_cast(m_FadeTiming.out))); + + default: + break; } return 0; diff --git a/OSCWidgets/ToyPedal.cpp b/OSCWidgets/ToyPedal.cpp index 2fcc421..fcbd43f 100644 --- a/OSCWidgets/ToyPedal.cpp +++ b/OSCWidgets/ToyPedal.cpp @@ -123,6 +123,9 @@ void FadePedal::Update(unsigned int ms) } } break; + + default: + break; } // age ticks, but always keep last ticked value diff --git a/OSCWidgets/ToyWindow.cpp b/OSCWidgets/ToyWindow.cpp index 29c02eb..cd26412 100644 --- a/OSCWidgets/ToyWindow.cpp +++ b/OSCWidgets/ToyWindow.cpp @@ -774,6 +774,9 @@ bool ToyWindowTab::event(QEvent *event) case QEvent::PaletteChange: UpdateGridBackground(); break; + + default: + break; } return QWidget::event(event); From 6dbd6a98a86e59fcc38f39f2aead4fb0713fdead Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20S=C3=BC=C3=9Fkind?= Date: Wed, 23 May 2018 13:10:50 +0200 Subject: [PATCH 4/4] An uninitialized variable sometimes caused the Window Widget to start in edit mode --- OSCWidgets/ToyWindow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/OSCWidgets/ToyWindow.cpp b/OSCWidgets/ToyWindow.cpp index cd26412..0c0c20b 100644 --- a/OSCWidgets/ToyWindow.cpp +++ b/OSCWidgets/ToyWindow.cpp @@ -493,6 +493,7 @@ void EditFrame::paintEvent(QPaintEvent* /*event*/) ToyWindowTab::ToyWindowTab(QWidget *parent) : QWidget(parent) + , m_Mode(ToyWidget::MODE_DEFAULT) , m_ShowGrid(false) , m_MouseDown(false) {