summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZeeshan Ali (Khattak) <zeeshanak@gnome.org>2012-04-05 09:24:15 +0100
committerDaniel P. Berrange <berrange@redhat.com>2012-04-05 09:24:59 +0100
commit6109d5257d5ad2f571d88905f3298e97c6b547e6 (patch)
treec96eff700b174021cc2cc6c162566d5fb101a2e7
parentdc22bb1221cb25193dd932cbceef8aafea2fb4fa (diff)
Minor simplification/optimization of VirtViewerDisplay
-rw-r--r--AUTHORS1
-rw-r--r--src/virt-viewer-display.c14
2 files changed, 6 insertions, 9 deletions
diff --git a/AUTHORS b/AUTHORS
index 020dfcb..4cabed3 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -21,6 +21,7 @@ With additional patches from:
Richard W.M. Jones <rjones@redhat.com>
Ronnie Sahlberg <ronniesahlberg@gmail.com>
Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
+ Zeeshan Ali (Khattak) <zeeshanak@gnome.org>
...send patches to get your name here...
diff --git a/src/virt-viewer-display.c b/src/virt-viewer-display.c
index 49abf1c..8cc079c 100644
--- a/src/virt-viewer-display.c
+++ b/src/virt-viewer-display.c
@@ -342,19 +342,15 @@ virt_viewer_display_size_request(GtkWidget *widget,
requisition->height = border_width * 2;
if (priv->dirty) {
- if (priv->zoom)
+ if (priv->zoom) {
requisition->width += priv->desktopWidth * priv->zoom_level / 100;
- else
- requisition->width += priv->desktopWidth;
- } else {
- requisition->width += 50;
- }
- if (priv->dirty) {
- if (priv->zoom)
requisition->height += priv->desktopHeight * priv->zoom_level / 100;
- else
+ } else {
+ requisition->width += priv->desktopWidth;
requisition->height += priv->desktopHeight;
+ }
} else {
+ requisition->width += 50;
requisition->height += 50;
}