display: Set useful values for MIN_DISPLAY_{WIDTH, HEIGHT}
Nowadays the value for MIN_DISPLAY_{WIDTH,HEIGHT} is 50. This arbitrary
value doesn't bring any benefit, doesn't provide a useful size for a
desktop to be usable and can actually trigger some undefined behavior
when reaching resolutions that are lower than the ones provided by the
video drivers (as in rhbz#1296878).
In order to avoid these issues and provide a minimum resolution that can
still be useful for our users, let's use the same values for minimum
width and height used by the linux QXL drivers (320x200).
This also requires us to adjust the minimum requested widget size when
zoom is enabled so that we don't accidentally request a size smaller
than the driver can support.
Related: rhbz#1296878
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
Jonathon Jongsma
8 years ago
| 115 | 115 | "Desktop width", |
| 116 | 116 | MIN_DISPLAY_WIDTH, |
| 117 | 117 | G_MAXINT32, |
| 118 | 100, | |
| 118 | MIN_DISPLAY_WIDTH, | |
| 119 | 119 | G_PARAM_READWRITE)); |
| 120 | 120 | |
| 121 | 121 | g_object_class_install_property(object_class, |
| 125 | 125 | "Desktop height", |
| 126 | 126 | MIN_DISPLAY_HEIGHT, |
| 127 | 127 | G_MAXINT32, |
| 128 | 100, | |
| 128 | MIN_DISPLAY_HEIGHT, | |
| 129 | 129 | G_PARAM_READWRITE)); |
| 130 | 130 | |
| 131 | 131 | g_object_class_install_property(object_class, |
| 273 | 273 | |
| 274 | 274 | display->priv = VIRT_VIEWER_DISPLAY_GET_PRIVATE(display); |
| 275 | 275 | |
| 276 | display->priv->desktopWidth = 100; | |
| 277 | display->priv->desktopHeight = 100; | |
| 276 | display->priv->desktopWidth = MIN_DISPLAY_WIDTH; | |
| 277 | display->priv->desktopHeight = MIN_DISPLAY_HEIGHT; | |
| 278 | 278 | display->priv->zoom_level = NORMAL_ZOOM_LEVEL; |
| 279 | 279 | display->priv->zoom = TRUE; |
| 280 | 280 | #if !GTK_CHECK_VERSION(3, 0, 0) |
| 424 | 424 | if (priv->dirty || !priv->size_request_once) { |
| 425 | 425 | virt_viewer_display_get_preferred_size(display, requisition); |
| 426 | 426 | } else { |
| 427 | requisition->width = MIN_DISPLAY_WIDTH; | |
| 428 | requisition->height = MIN_DISPLAY_HEIGHT; | |
| 427 | requisition->width = MIN_DISPLAY_WIDTH * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL; | |
| 428 | requisition->height = MIN_DISPLAY_HEIGHT * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL; | |
| 429 | 429 | } |
| 430 | 430 | |
| 431 | 431 | priv->size_request_once = TRUE; |
| 459 | 459 | VirtViewerDisplayPrivate *priv = display->priv; |
| 460 | 460 | int border_width = gtk_container_get_border_width(GTK_CONTAINER(widget)); |
| 461 | 461 | |
| 462 | *minwidth = MIN_DISPLAY_WIDTH + 2 * border_width; | |
| 463 | 462 | |
| 464 | 463 | if (priv->zoom) { |
| 465 | *defwidth = round(priv->desktopWidth * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL) + | |
| 466 | 2 * border_width; | |
| 464 | *defwidth = round(priv->desktopWidth * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL); | |
| 465 | *minwidth = round(MIN_DISPLAY_WIDTH * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL); | |
| 467 | 466 | } else { |
| 468 | *defwidth = priv->desktopWidth + 2 * border_width; | |
| 469 | } | |
| 467 | *defwidth = priv->desktopWidth; | |
| 468 | *minwidth = MIN_DISPLAY_WIDTH; | |
| 469 | } | |
| 470 | *defwidth += 2 * border_width; | |
| 471 | *minwidth += 2 * border_width; | |
| 470 | 472 | } |
| 471 | 473 | |
| 472 | 474 | |
| 478 | 480 | VirtViewerDisplayPrivate *priv = display->priv; |
| 479 | 481 | int border_height = gtk_container_get_border_width(GTK_CONTAINER(widget)); |
| 480 | 482 | |
| 481 | *minheight = MIN_DISPLAY_HEIGHT + 2 * border_height; | |
| 482 | ||
| 483 | 483 | if (priv->zoom) { |
| 484 | *defheight = round(priv->desktopHeight * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL) + | |
| 485 | 2 * border_height; | |
| 484 | *defheight = round(priv->desktopHeight * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL); | |
| 485 | *minheight = round(MIN_DISPLAY_HEIGHT * priv->zoom_level / (double) NORMAL_ZOOM_LEVEL); | |
| 486 | 486 | } else { |
| 487 | *defheight = priv->desktopHeight + 2 * border_height; | |
| 488 | } | |
| 487 | *defheight = priv->desktopHeight; | |
| 488 | *minheight = MIN_DISPLAY_HEIGHT; | |
| 489 | } | |
| 490 | *defheight += 2 * border_height; | |
| 491 | *minheight += 2 * border_height; | |
| 489 | 492 | } |
| 490 | 493 | #endif |
| 491 | 494 | |