Kaydet (Commit) 7e2ef433 authored tarafından Caolán McNamara's avatar Caolán McNamara

Resolves: tdf#102957 revert SetMinOutputSizePixel workaround

of

commit afeddaf7
Author: Caolán McNamara <caolanm@redhat.com>
Date:   Wed Dec 16 10:46:10 2015 +0000

    Related: rhbz#1281906 set a min size on un-resizeable non-layout dialogs

and using a mixture of gtk_window_set_default_size before its visible, and
gtk_window_set_default_size + gtk_window_resize after its shown now works for
me under wayland so the original problem can be solved that way

Change-Id: Iaf8fd3019a7e902ad07b6825f919c6f25288e9b7
üst ec4e48c7
...@@ -1162,10 +1162,6 @@ void SystemWindow::DoInitialLayout() ...@@ -1162,10 +1162,6 @@ void SystemWindow::DoInitialLayout()
setOptimalLayoutSize(); setOptimalLayoutSize();
mbIsCalculatingInitialLayoutSize = false; mbIsCalculatingInitialLayoutSize = false;
} }
else if (IsDialog() && !(GetStyle() & WB_SIZEABLE))
{
SetMinOutputSizePixel(GetSizePixel());
}
} }
void SystemWindow::doDeferredInit(WinBits /*nBits*/) void SystemWindow::doDeferredInit(WinBits /*nBits*/)
......
...@@ -901,7 +901,9 @@ void GtkSalFrame::window_resize(long nWidth, long nHeight) ...@@ -901,7 +901,9 @@ void GtkSalFrame::window_resize(long nWidth, long nHeight)
{ {
m_nWidthRequest = nWidth; m_nWidthRequest = nWidth;
m_nHeightRequest = nHeight; m_nHeightRequest = nHeight;
gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight); gtk_window_set_default_size(GTK_WINDOW(m_pWindow), nWidth, nHeight);
if (gtk_widget_get_visible(m_pWindow))
gtk_window_resize(GTK_WINDOW(m_pWindow), nWidth, nHeight);
} }
void GtkSalFrame::resizeWindow( long nWidth, long nHeight ) void GtkSalFrame::resizeWindow( long nWidth, long nHeight )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment