mir/tdesktop
2
0
Fork 0
mirror of https://github.com/telegramdesktop/tdesktop synced 2025-09-06 17:35:36 +00:00
Code Issues Releases Wiki Activity

Building Qt with -no-gtkstyle and disable forcing "-style=0" in main.cpp

Browse Source 
We can't use Qt gtk style, because it loads gtk-2 and we are possibly
loading and using gtk-3 for libappindicator3 and it crashes :(
This commit is contained in:
John Preston
2016-07-07 19:12:52 +03:00
parent 5f46541f0b
commit a20dd065fb
8 changed files with 57 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Telegram/SourceFiles/platform/linux/linux_gdk_helper.cpp
View File

@@ -51,19 +51,15 @@ using f_gdk_x11_drawable_get_xid = XID(*)(GdkDrawable*);
f_gdk_x11_drawable_get_xid gdk_x11_drawable_get_xid = nullptr;
// Gtk 3
// To be able to compile with gtk-2.0 headers as well
#ifndef GDK_TYPE_X11_WINDOW
#define GDK_TYPE_X11_WINDOW (gdk_x11_window_get_type())
#endif // GDK_TYPE_X11_WINDOW
#ifndef GDK_IS_X11_WINDOW
#define GDK_IS_X11_WINDOW(object) (G_TYPE_CHECK_INSTANCE_TYPE((object), GDK_TYPE_X11_WINDOW))
#endif // GDK_IS_X11_WINDOW
using f_gdk_x11_window_get_type = GType (*)(void);
f_gdk_x11_window_get_type gdk_x11_window_get_type = nullptr;
// To be able to compile with gtk-2.0 headers as well
template <typename Object>
inline bool gdk_is_x11_window_check(Object *obj) {
return Libs::g_type_cit_helper(obj, gdk_x11_window_get_type());
}
using f_gdk_window_get_display = GdkDisplay*(*)(GdkWindow *window);
f_gdk_window_get_display gdk_window_get_display = nullptr;
@@ -106,7 +102,7 @@ void XSetTransientForHint(GdkWindow *window, quintptr winId) {
gdk_x11_drawable_get_xid(window),
winId);
} else if (gdk_helper_loaded == GtkLoaded::Gtk3) {
if (GDK_IS_X11_WINDOW(window)) {
if (gdk_is_x11_window_check(window)) {
::XSetTransientForHint(gdk_x11_display_get_xdisplay(gdk_window_get_display(window)),
gdk_x11_window_get_xid(window),
winId);