Skip to content

Commit 9e4e412

Browse files
jonasschnelliPastaPastaPasta
authored andcommitted
Merge #20: Wrap tooltips in the intro window
6ed4bca qt: Wrap tooltips in the intro window (Hennadii Stepanov) Pull request description: On master (d6fe5b2): ![DeepinScreenshot_select-area_20200702082514](https://user-images.githubusercontent.com/32963518/86319852-18e6e200-bc3e-11ea-902c-1b868540f4cf.png) With this PR: ![Screenshot from 2020-07-02 08-22-44](https://user-images.githubusercontent.com/32963518/86319881-28fec180-bc3e-11ea-9d76-522a5e71c32d.png) --- This is a move-only change. This was done while reviewing #15. ACKs for top commit: jonasschnelli: utACK 6ed4bca Tree-SHA512: 67507c8c5628cd95fe8e377ce21e2c23d305faf1affa0b7579885553c20055ba07ed61e2aed3230d7cd22c3c90f76e0c58cb3238be9f153a8ca6e6d4e38753b0
1 parent 8ab4e7f commit 9e4e412

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

src/qt/dash.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -515,6 +515,9 @@ int GuiMain(int argc, char* argv[])
515515
return EXIT_SUCCESS;
516516
}
517517

518+
// Install global event filter that makes sure that long tooltips can be word-wrapped
519+
app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app));
520+
518521
/// 5. Now that settings and translations are available, ask user for data directory
519522
// User language is set up: pick a data directory
520523
if (!Intro::pickDataDirectory(*node))
@@ -575,8 +578,6 @@ int GuiMain(int argc, char* argv[])
575578
#endif
576579

577580
/// 9. Main GUI initialization
578-
// Install global event filter that makes sure that long tooltips can be word-wrapped
579-
app.installEventFilter(new GUIUtil::ToolTipToRichTextFilter(TOOLTIP_WRAP_THRESHOLD, &app));
580581
// Install global event filter that makes sure that out-of-focus labels do not contain text cursor.
581582
app.installEventFilter(new GUIUtil::LabelOutOfFocusEventFilter(&app));
582583
#if defined(Q_OS_WIN)

0 commit comments

Comments
 (0)