summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dransfeld <sebastian.dransfeld@sintef.no>2013-11-05 10:54:23 +0100
committerSebastian Dransfeld <sebastian.dransfeld@sintef.no>2013-11-07 09:18:16 +0100
commit3dc5eb16cc90cc14128d074af3f63d3afe70786a (patch)
treeaf3c135a5b7fe3f355b24c6950f84da907737fb4
parent144d124445466dfbf7b79d86dbdb701f43e67e84 (diff)
ecore_x: accept -1 as valid mm size for no change
If we pass in w_mm = h_mm = -1 we want no change if w == cw and h == ch, as we calculate w_mm and h_mm based on these later.
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_randr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/lib/ecore_x/xlib/ecore_x_randr.c b/src/lib/ecore_x/xlib/ecore_x_randr.c
index c6729c3e31..57d2e6e802 100644
--- a/src/lib/ecore_x/xlib/ecore_x_randr.c
+++ b/src/lib/ecore_x/xlib/ecore_x_randr.c
@@ -638,7 +638,9 @@ ecore_x_randr_screen_current_size_set(Ecore_X_Window root, int w, int h, int w_m
638 ecore_x_randr_screen_current_size_get(root, &cw, &ch, &cwmm, &chmm); 638 ecore_x_randr_screen_current_size_get(root, &cw, &ch, &cwmm, &chmm);
639 639
640 /* compare to the values passed in. if there are no changes, get out */ 640 /* compare to the values passed in. if there are no changes, get out */
641 if ((w == cw) && (h == ch) && (w_mm == cwmm) && (h_mm == chmm)) 641 if ((w == cw) && (h == ch) &&
642 ((w_mm == -1) || (w_mm == cwmm)) &&
643 ((h_mm == -1) || (h_mm == chmm)))
642 return EINA_TRUE; 644 return EINA_TRUE;
643 645
644 /* get the current size range */ 646 /* get the current size range */