aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEli Zaretskii2019-04-13 11:01:39 +0300
committerEli Zaretskii2019-04-13 11:01:39 +0300
commit5a9937beb6347b330ddbb942c9c6f7ce1abb67c9 (patch)
tree5a4adfb7c0c5c7b9aef82791b637d9844f29b8b7 /src
parentd82d4fb9157dd86359e4489c8da100943754a4d0 (diff)
downloademacs-5a9937beb6347b330ddbb942c9c6f7ce1abb67c9.tar.gz
emacs-5a9937beb6347b330ddbb942c9c6f7ce1abb67c9.zip
Minor cleanup in 'x_set_frame_alpha'
* src/xterm.c (x_set_frame_alpha): Remove redundant parts of testing of value of 'alpha'. Suggested by Konstantin Kharlamov <Hi-Angel@yandex.ru>. (Bug#35062)
Diffstat (limited to 'src')
-rw-r--r--src/xterm.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c
index 5aa3e3ff25c..def6915d62e 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -922,16 +922,17 @@ x_set_frame_alpha (struct frame *f)
922 else 922 else
923 alpha = f->alpha[1]; 923 alpha = f->alpha[1];
924 924
925 if (alpha < 0.0)
926 return;
927
925 if (FLOATP (Vframe_alpha_lower_limit)) 928 if (FLOATP (Vframe_alpha_lower_limit))
926 alpha_min = XFLOAT_DATA (Vframe_alpha_lower_limit); 929 alpha_min = XFLOAT_DATA (Vframe_alpha_lower_limit);
927 else if (FIXNUMP (Vframe_alpha_lower_limit)) 930 else if (FIXNUMP (Vframe_alpha_lower_limit))
928 alpha_min = (XFIXNUM (Vframe_alpha_lower_limit)) / 100.0; 931 alpha_min = (XFIXNUM (Vframe_alpha_lower_limit)) / 100.0;
929 932
930 if (alpha < 0.0) 933 if (alpha > 1.0)
931 return;
932 else if (alpha > 1.0)
933 alpha = 1.0; 934 alpha = 1.0;
934 else if (0.0 <= alpha && alpha < alpha_min && alpha_min <= 1.0) 935 else if (alpha < alpha_min && alpha_min <= 1.0)
935 alpha = alpha_min; 936 alpha = alpha_min;
936 937
937 opac = alpha * OPAQUE; 938 opac = alpha * OPAQUE;