Automatic container resize now takes the arrangement of the parent of the container into account.
[GB.GTK] * BUG: Automatic container resize now takes the arrangement of the parent of the container into account. [GB.GTK3] * BUG: Automatic container resize now takes the arrangement of the parent of the container into account. [GB.QT4] * BUG: Automatic container resize now takes the arrangement of the parent of the container into account. [GB.QT5] * BUG: Automatic container resize now takes the arrangement of the parent of the container into account.
This commit is contained in:
parent
8d05d066d9
commit
aaf05b7c96
5 changed files with 5 additions and 4 deletions
|
@ -93,7 +93,7 @@ static void resize_container(gContainer *cont, int w, int h)
|
|||
h += cont->height() - cont->containerHeight();*/
|
||||
|
||||
if (w >= 0 && h >= 0)
|
||||
cont->resize(w, h, true);
|
||||
cont->resize(w, h);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1353,6 +1353,7 @@ void gControl::setFocus()
|
|||
#if DEBUG_FOCUS
|
||||
fprintf(stderr, "setFocus now %s\n", name());
|
||||
#endif
|
||||
//win->activate();
|
||||
gtk_widget_grab_focus(widget);
|
||||
}
|
||||
else
|
||||
|
|
|
@ -263,7 +263,7 @@ static void resize_container(void *_object, QWidget *cont, int w, int h)
|
|||
#if USE_CACHE
|
||||
resize_widget(_object, w + wid->width() - cont->width(), h + wid->height() - cont->height());
|
||||
#else
|
||||
CWIDGET_resize(_object, w + wid->width() - cont->width(), h + wid->height() - cont->height());
|
||||
CWIDGET_auto_resize(_object, w + wid->width() - cont->width(), h + wid->height() - cont->height());
|
||||
#endif
|
||||
}
|
||||
|
||||
|
|
|
@ -1122,6 +1122,7 @@ static void set_focus(void *_object)
|
|||
{
|
||||
//qDebug("set focus on %s for %s", THIS->name, ((CWIDGET *)win)->name);
|
||||
WIDGET->setFocus();
|
||||
//((MyMainWindow *)(win->widget.widget))->activate();
|
||||
}
|
||||
else if ((CWIDGET *)win != THIS)
|
||||
{
|
||||
|
|
|
@ -879,7 +879,6 @@ BEGIN_PROPERTY(Window_Text)
|
|||
GB.Raise(THIS, EVENT_Title, 0);
|
||||
}
|
||||
|
||||
|
||||
END_PROPERTY
|
||||
|
||||
|
||||
|
@ -2373,7 +2372,7 @@ void MyMainWindow::resizeEvent(QResizeEvent *e)
|
|||
//qDebug("resizeEvent %ld %ld isHidden:%s shown:%s ", THIS->w, THIS->h, isHidden() ? "1" : "0", shown ? "1" : "0");
|
||||
//qDebug("THIS->h = %ld THIS->container->height() = %ld height() = %ld", THIS->h, THIS->container->height(), height());
|
||||
|
||||
if (THIS->opened)
|
||||
if (THIS->opened && (e->spontaneous() || parentWidget()))
|
||||
raise_resize_event(THIS);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue