Move gtk initialization back to ThirdParty::start
This commit is contained in:
parent
26d3995424
commit
89b11ef084
|
@ -747,15 +747,10 @@ void start() {
|
||||||
|
|
||||||
if (const auto integration = BaseGtkIntegration::Instance()) {
|
if (const auto integration = BaseGtkIntegration::Instance()) {
|
||||||
integration->prepareEnvironment();
|
integration->prepareEnvironment();
|
||||||
integration->load();
|
|
||||||
} else {
|
} else {
|
||||||
g_warning("GTK integration is disabled, some features unavailable.");
|
g_warning("GTK integration is disabled, some features unavailable.");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (const auto integration = GtkIntegration::Instance()) {
|
|
||||||
integration->load();
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef DESKTOP_APP_USE_PACKAGED_RLOTTIE
|
#ifdef DESKTOP_APP_USE_PACKAGED_RLOTTIE
|
||||||
g_warning(
|
g_warning(
|
||||||
"Application has been built with foreign rlottie, "
|
"Application has been built with foreign rlottie, "
|
||||||
|
@ -952,9 +947,14 @@ namespace ThirdParty {
|
||||||
|
|
||||||
void start() {
|
void start() {
|
||||||
if (const auto integration = BaseGtkIntegration::Instance()) {
|
if (const auto integration = BaseGtkIntegration::Instance()) {
|
||||||
|
integration->load();
|
||||||
integration->initializeSettings();
|
integration->initializeSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (const auto integration = GtkIntegration::Instance()) {
|
||||||
|
integration->load();
|
||||||
|
}
|
||||||
|
|
||||||
SetGtkScaleFactor();
|
SetGtkScaleFactor();
|
||||||
|
|
||||||
// wait for interface announce to know if native window frame is supported
|
// wait for interface announce to know if native window frame is supported
|
||||||
|
|
Loading…
Reference in New Issue