Updated with upstream update
This commit is contained in:
@ -221,7 +221,7 @@ dialogs_about_get (PikaDialogFactory *factory,
|
||||
PikaUIManager *ui_manager,
|
||||
gint view_size)
|
||||
{
|
||||
return about_dialog_create (context->pika->edit_config);
|
||||
return about_dialog_create (context->pika);
|
||||
}
|
||||
|
||||
GtkWidget *
|
||||
|
@ -151,6 +151,13 @@ quit_close_all_dialog_new (Pika *pika,
|
||||
GClosure *closure;
|
||||
gint rows;
|
||||
gint view_size;
|
||||
GdkRectangle geometry;
|
||||
GdkMonitor *monitor;
|
||||
gint max_rows;
|
||||
gint scale_factor;
|
||||
const gfloat rows_per_height = 32 / 1440.0f;
|
||||
const gint greatest_max_rows = 36;
|
||||
const gint least_max_rows = 6;
|
||||
|
||||
g_return_val_if_fail (PIKA_IS_PIKA (pika), NULL);
|
||||
|
||||
@ -206,8 +213,28 @@ quit_close_all_dialog_new (Pika *pika,
|
||||
|
||||
private->box = PIKA_MESSAGE_DIALOG (private->dialog)->box;
|
||||
|
||||
monitor = pika_widget_get_monitor (private->dialog);
|
||||
scale_factor = gdk_monitor_get_scale_factor (monitor);
|
||||
gdk_monitor_get_geometry (monitor, &geometry);
|
||||
|
||||
if (scale_factor > 1)
|
||||
{
|
||||
#ifdef GDK_WINDOWING_WIN32
|
||||
max_rows = (geometry.height * scale_factor * rows_per_height)
|
||||
/ (scale_factor + 1);
|
||||
#else
|
||||
max_rows = (geometry.height * rows_per_height) / (scale_factor + 1);
|
||||
#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
max_rows = geometry.height * rows_per_height;
|
||||
}
|
||||
|
||||
max_rows = CLAMP (max_rows, least_max_rows, greatest_max_rows);
|
||||
|
||||
view_size = pika->config->layer_preview_size;
|
||||
rows = CLAMP (pika_container_get_n_children (private->images), 3, 6);
|
||||
rows = CLAMP (pika_container_get_n_children (private->images), 3, max_rows);
|
||||
|
||||
view = pika_container_tree_view_new (private->images, private->context,
|
||||
view_size, 1);
|
||||
|
Reference in New Issue
Block a user