From 014f0cf7dbfe89d7b024282a5b6d876de36c745d Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Thu, 7 Jun 2018 18:00:39 +0300 Subject: Fix tutorial dialog flickering when dragging to another screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It's still unclear what the actual issue was, but copying paintEvent handling from about dialog, and making the dialog form more like about dialog, i.e. adding a layout to the dialog and setting one of the QLabels to have word wrap fixes the flickering. The fact that word wrap makes a difference likely means that the root cause is some Qt bug and this might break again when Qt version changes. Since tutorial dialog didn't have QLabel originally, removed text from checkbox and added a separate label for it. Task-number: QT3DS-939 Change-Id: If39d73851c5f7095bf630d4fe46446b81b9b4100 Reviewed-by: Tomi Korpipää Reviewed-by: Mahmoud Badri Reviewed-by: Pasi Keränen Reviewed-by: Miikka Heikkinen --- .../Studio/Application/StudioTutorialWidget.ui | 445 +++++++++++---------- 1 file changed, 236 insertions(+), 209 deletions(-) (limited to 'src/Authoring/Studio/Application/StudioTutorialWidget.ui') diff --git a/src/Authoring/Studio/Application/StudioTutorialWidget.ui b/src/Authoring/Studio/Application/StudioTutorialWidget.ui index f7fe978c..2ec4fe7d 100644 --- a/src/Authoring/Studio/Application/StudioTutorialWidget.ui +++ b/src/Authoring/Studio/Application/StudioTutorialWidget.ui @@ -25,248 +25,275 @@ StudioTutorialWidget - - - - 0 - 0 - 1440 - 900 - + + + 0 - - - 0 - - - - - QLayout::SetNoConstraint + + 0 + + + 0 + + + 0 + + + + + + 0 - - - - 0 - 0 - + + + QLayout::SetNoConstraint - - studioTutorialShowAgain - - - Do Not Show This Again - - + + + + + 0 + 0 + + + + studioTutorialShowAgain + + + + + + + + + + + 0 + 0 + + + + Do Not Show This Again + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + true + + + + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 16 + + + + + + + + Qt::Horizontal + + + + 40 + 16 + + + + + - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 16 - - - - - - - - Qt::Horizontal - - - - 40 - 16 - - - - - - - - - - - 0 - - - QLayout::SetMaximumSize - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 39 - 39 - - - - Qt::NoFocus - - - studioTutorialBack - - - - - - - :/images/Tutorial/button_back.png:/images/Tutorial/button_back.png - - - - 39 - 39 - - - - true - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 323 - 46 - - - - - - - - - 0 - 0 - - - - - 39 - 39 - - - - Qt::NoFocus - - - StudioTutorialWidget - - - + + + + 0 - - - :/images/Tutorial/button_next.png:/images/Tutorial/button_next.png + + QLayout::SetMaximumSize - - - 39 - 39 - + + 0 - - true + + 0 - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - QLayout::SetMaximumSize - - - - - Qt::Horizontal + + 0 - - - 40 - 20 - + + 0 - - - - - + + + + 39 + 39 + + Qt::NoFocus - studioTutorialOpen + studioTutorialBack - Open Sample Project + + + + + :/images/Tutorial/button_back.png:/images/Tutorial/button_back.png + + + + 39 + 39 + + + + true - + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 323 + 46 + + + + + + + + + 0 + 0 + + + + + 39 + 39 + + Qt::NoFocus - studioTutorialNew + StudioTutorialWidget - Create New + + + + + :/images/Tutorial/button_next.png:/images/Tutorial/button_next.png + + + + 39 + 39 + + + + true - - - - - - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + QLayout::SetMaximumSize + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + Qt::NoFocus + + + studioTutorialOpen + + + Open Sample Project + + + + + + + Qt::NoFocus + + + studioTutorialNew + + + Create New + + + + + + + + + + + + -- cgit v1.2.3