From: Alexander Orzechowski <orzechowski.alexander@gmail.com>
To: qemu-devel@nongnu.org
Cc: qemu-trivial@nongnu.org, Gerd Hoffmann <kraxel@redhat.com>,
Alexander Orzechowski <orzechowski.alexander@gmail.com>
Subject: [PATCH 2/4] ui: Remove unnecessary checks
Date: Sat, 18 Dec 2021 21:30:04 -0500 [thread overview]
Message-ID: <20211219023006.124530-3-orzechowski.alexander@gmail.com> (raw)
In-Reply-To: <20211219023006.124530-1-orzechowski.alexander@gmail.com>
These conditionals should never be false as scale_x and scale_y should
scale the fbw and fbh variables such that the ww and wh variables always
have a greater magnitude.
Signed-off-by: Alexander Orzechowski <orzechowski.alexander@gmail.com>
---
ui/gtk.c | 27 ++++++---------------------
1 file changed, 6 insertions(+), 21 deletions(-)
diff --git a/ui/gtk.c b/ui/gtk.c
index 824334ff3d..f2d74b253d 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -416,13 +416,8 @@ static void gd_update(DisplayChangeListener *dcl,
ww = gtk_widget_get_allocated_width(vc->gfx.drawing_area);
wh = gtk_widget_get_allocated_height(vc->gfx.drawing_area);
- mx = my = 0;
- if (ww > fbw) {
- mx = (ww - fbw) / 2;
- }
- if (wh > fbh) {
- my = (wh - fbh) / 2;
- }
+ mx = (ww - fbw) / 2;
+ my = (wh - fbh) / 2;
gtk_widget_queue_draw_area(vc->gfx.drawing_area,
mx + x1, my + y1, (x2 - x1), (y2 - y1));
@@ -801,13 +796,8 @@ static gboolean gd_draw_event(GtkWidget *widget, cairo_t *cr, void *opaque)
fbw *= vc->gfx.scale_x;
fbh *= vc->gfx.scale_y;
- mx = my = 0;
- if (ww > fbw) {
- mx = (ww - fbw) / 2;
- }
- if (wh > fbh) {
- my = (wh - fbh) / 2;
- }
+ mx = (ww - fbw) / 2;
+ my = (wh - fbh) / 2;
cairo_rectangle(cr, 0, 0, ww, wh);
@@ -850,13 +840,8 @@ static gboolean gd_motion_event(GtkWidget *widget, GdkEventMotion *motion,
ws = gdk_window_get_scale_factor(
gtk_widget_get_window(vc->gfx.drawing_area));
- mx = my = 0;
- if (ww > fbw) {
- mx = (ww - fbw) / 2;
- }
- if (wh > fbh) {
- my = (wh - fbh) / 2;
- }
+ mx = (ww - fbw) / 2;
+ my = (wh - fbh) / 2;
x = (motion->x - mx) / vc->gfx.scale_x * ws;
y = (motion->y - my) / vc->gfx.scale_y * ws;
--
2.34.1
next prev parent reply other threads:[~2021-12-19 2:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-19 2:30 [PATCH 0/4] UI fixups Alexander Orzechowski
2021-12-19 2:30 ` [PATCH 1/4] ui: Use allocated size instead of window size Alexander Orzechowski
2021-12-21 7:27 ` Marc-André Lureau
2021-12-19 2:30 ` Alexander Orzechowski [this message]
2021-12-21 7:40 ` [PATCH 2/4] ui: Remove unnecessary checks Marc-André Lureau
2021-12-21 8:26 ` Alexander Orzechowski
2021-12-19 2:30 ` [PATCH 3/4] ui: Revert: "fix incorrect pointer position on highdpi with gtk" Alexander Orzechowski
2021-12-19 2:30 ` [PATCH 4/4] ui: Fix gtk/gl when the scaled virtual console does not fit the window Alexander Orzechowski
2021-12-21 7:48 ` Marc-André Lureau
2021-12-21 8:07 ` Alexander Orzechowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211219023006.124530-3-orzechowski.alexander@gmail.com \
--to=orzechowski.alexander@gmail.com \
--cc=kraxel@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-trivial@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).