callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

win32draw: Use the right checks

Browse Source 
The first check was the wrong way around.

The second check made the function look wrong. Invalid ID is actually
the special case that should be handled first, so write the function
like that.
This commit is contained in:
Benjamin Otte
2016-02-22 04:00:36 +01:00
parent cdb12fec9e
commit 414657100f
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkwin32draw.c
View File

@ -481,7 +481,7 @@ gtk_win32_get_sys_metric_id_for_name (const char *name)
int
gtk_win32_get_sys_metric (gint id)
{
if (id >= 0 && id < G_N_ELEMENTS (win32_default_metrics))
if (id < 0 || id >= G_N_ELEMENTS (win32_default_metrics))
return 0;
if (win32_default_metrics[id].get_value)
@ -558,9 +558,12 @@ void
gtk_win32_get_sys_color (gint id,
GdkRGBA *color)
{
if (id < G_N_ELEMENTS (win32_default_colors))
*color = win32_default_colors[id].rgba;
else
gdk_rgba_parse (color, "black");
if (id < 0 || id >= G_N_ELEMENTS (win32_default_colors))
{
gdk_rgba_parse (color, "black");
return;
}
*color = win32_default_colors[id].rgba;
}