From 0a21fe9fb929e5dd1c753b880f2d440f2543b3db Mon Sep 17 00:00:00 2001
From: SeeLook <945374+SeeLook@users.noreply.github.com>
Date: Sun, 4 Dec 2016 18:12:37 +0100
Subject: [PATCH] Hide guitar body when guitar widget is hidden. TbgPixmap
detects when window size is null - then pixmap also is empty.
---
changes | 1 +
src/libs/main/gui/tbgpixmap.cpp | 2 +-
src/mainwindow.cpp | 3 ++-
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/changes b/changes
index dce159040..9472789e0 100644
--- a/changes
+++ b/changes
@@ -9,6 +9,7 @@
- volume settings and pitch preview can be invoked with volume keys
- stop pitch detection when app is going background, restore when backs
BUGS FIXES
+ - fixed positioning of tips with question content
- other small fixes
1.3.0 alpha1
diff --git a/src/libs/main/gui/tbgpixmap.cpp b/src/libs/main/gui/tbgpixmap.cpp
index 0462807a7..c66daf82f 100644
--- a/src/libs/main/gui/tbgpixmap.cpp
+++ b/src/libs/main/gui/tbgpixmap.cpp
@@ -46,7 +46,7 @@ TbgPixmap::~TbgPixmap()
void TbgPixmap::update(const QSize& windowSize, int instr, int guitarHeight, int XIIfretXpos, int fingerboardX, bool rightHanded) {
if (windowSize != m_windowSize || instr != m_instr || m_rightHanded != rightHanded) {
Einstrument in = static_cast<Einstrument>(instr);
- if (in == e_noInstrument) {
+ if (in == e_noInstrument || windowSize.isNull()) {
QPixmap nullPix;
swap(nullPix);
} else {
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index f2e981cc4..8ebe03cb0 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -629,7 +629,8 @@ void MainWindow::updateSize(QSize newS) {
#endif
m_guitar->updateSize(QSize(m_innerWidget->width(), newGuitH));
- BG_PIX->update(newS, static_cast<int>(gl->instrument), newGuitH, m_guitar->posX12fret(), m_guitar->fbRect().right(), gl->GisRightHanded);
+ BG_PIX->update(gl->L->guitarEnabled ? newS : QSize(), static_cast<int>(gl->instrument), newGuitH,
+ m_guitar->posX12fret(), m_guitar->fbRect().right(), gl->GisRightHanded); // empty size when guitar is hidden by user
m_guitar->setFixedHeight(newGuitH);
setUpdatesEnabled(true);
}
--
GitLab