Move gtk initialization back to ThirdParty::start

This commit is contained in:
Ilya Fedin 2021-04-29 19:49:49 +04:00 committed by John Preston
parent 26d3995424
commit 89b11ef084
1 changed files with 5 additions and 5 deletions

View File

@ -747,15 +747,10 @@ void start() {
if (const auto integration = BaseGtkIntegration::Instance()) {
integration->prepareEnvironment();
integration->load();
} else {
g_warning("GTK integration is disabled, some features unavailable.");
}
if (const auto integration = GtkIntegration::Instance()) {
integration->load();
}
#ifdef DESKTOP_APP_USE_PACKAGED_RLOTTIE
g_warning(
"Application has been built with foreign rlottie, "
@ -952,9 +947,14 @@ namespace ThirdParty {
void start() {
if (const auto integration = BaseGtkIntegration::Instance()) {
integration->load();
integration->initializeSettings();
}
if (const auto integration = GtkIntegration::Instance()) {
integration->load();
}
SetGtkScaleFactor();
// wait for interface announce to know if native window frame is supported