github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlCore: Gtk: Fixed issue with close button

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@11025 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2017-04-22 21:46:58 +00:00
parent fa36aaa477
commit 1e375dbf6c
2 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
uppsrc/CtrlCore/GtkCreate.cpp
View file

@ -44,13 +44,18 @@ void Ctrl::Create(Ctrl *owner, bool popup)
gtk_widget_set_events(top->window, 0xffffffff);
g_signal_connect(top->window, "event", G_CALLBACK(GtkEvent), (gpointer)(uintptr_t)top->id);
gtk_widget_realize(top->window);
GdkWindowTypeHint hint = gtk_window_get_type_hint(gtk());
if(tw && findarg(hint, GDK_WINDOW_TYPE_HINT_NORMAL, GDK_WINDOW_TYPE_HINT_DIALOG, GDK_WINDOW_TYPE_HINT_UTILITY) >= 0)
tw->SyncSizeHints();
Rect r = GetRect();
gtk_window_move(gtk(), r.left, r.top);
gtk_window_resize(gtk(), r.GetWidth(), r.GetHeight());
gtk_widget_realize(top->window);
if(owner && owner->top)
gtk_window_set_transient_for(gtk(), owner->gtk());
gtk_widget_set_app_paintable(top->window, TRUE);

2
uppsrc/CtrlCore/GtkTop.cpp
View file

@ -196,7 +196,7 @@ void TopWindow::Minimize(bool effect)
TopWindow& TopWindow::FullScreen(bool b)
{
SetMode(b ? FULLSCREEN : OVERLAPPED);
SetMode(b ? (int)FULLSCREEN : (int)OVERLAPPED);
return *this;
}