procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-03 17:33:25 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

app: don't use gdk_screen_get_height() in GimpSearchPopup

Browse source 
The API is deprecated, use gdk_monitor_get_workarea() instead and move
all involved logic to size_allocate().
This commit is contained in:
Michael Natterer 2019-07-04 14:04:50 +02:00
parent 7a589951c9
commit 472e75341a
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/widgets/gimpsearchpopup.c
View file

@ -340,8 +340,7 @@ gimp_search_popup_add_result (GimpSearchPopup *popup,
static void static void
gimp_search_popup_constructed (GObject *object) gimp_search_popup_constructed (GObject *object)
{ {
GimpSearchPopup *popup = GIMP_SEARCH_POPUP (object); GimpSearchPopup *popup = GIMP_SEARCH_POPUP (object);
GdkScreen *screen = gdk_screen_get_default ();
GtkWidget *main_vbox; GtkWidget *main_vbox;
G_OBJECT_CLASS (parent_class)->constructed (object); G_OBJECT_CLASS (parent_class)->constructed (object);
@ -385,11 +384,6 @@ gimp_search_popup_constructed (GObject *object)
g_signal_connect (popup->priv->results_list, "row-activated", g_signal_connect (popup->priv->results_list, "row-activated",
G_CALLBACK (results_list_row_activated), G_CALLBACK (results_list_row_activated),
popup); popup);
/* Default size of the search popup showing the result list is half
* the screen. */
if (window_height == 0)
window_height = gdk_screen_get_height (screen) / 2;
} }
static void static void
@ -449,19 +443,26 @@ gimp_search_popup_size_allocate (GtkWidget *widget,
GtkAllocation *allocation) GtkAllocation *allocation)
{ {
GimpSearchPopup *popup = GIMP_SEARCH_POPUP (widget); GimpSearchPopup *popup = GIMP_SEARCH_POPUP (widget);
GdkRectangle workarea;
GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation); GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
gdk_monitor_get_workarea (gimp_widget_get_monitor (widget),
&workarea);
if (window_height == 0)
{
/* Default to half the monitor */
window_height = workarea.height / 2;
}
if (gtk_widget_get_visible (widget) && if (gtk_widget_get_visible (widget) &&
gtk_widget_get_visible (popup->priv->list_view)) gtk_widget_get_visible (popup->priv->list_view))
{ {
GdkScreen *screen = gdk_screen_get_default ();
/* Save the window height when results are shown so that resizes /* Save the window height when results are shown so that resizes
* by the user are saved across searches. * by the user are saved across searches.
*/ */
window_height = MAX (gdk_screen_get_height (screen) / 4, window_height = MAX (workarea.height / 4, allocation->height);
allocation->height);
} }
} }