takino
/
termite
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #400 from jelly/assert_valid_color 

load_theme: set alpha to 0 of GdkRGBA
This commit is contained in:
jelle van der Waa 2016-10-02 19:12:24 +02:00 committed by GitHub
parent ea0bc59e38 80ab246023
commit a9cecb4b9d
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
termite.cc
View File

@ -1279,6 +1279,7 @@ static void load_theme(GtkWindow *window, VteTerminal *vte, GKeyFile *config, hi
palette[i].blue = (((i & 4) ? 0xc000 : 0) + (i > 7 ? 0x3fff: 0)) / 65535.0; palette[i].blue = (((i & 4) ? 0xc000 : 0) + (i > 7 ? 0x3fff: 0)) / 65535.0;
palette[i].green = (((i & 2) ? 0xc000 : 0) + (i > 7 ? 0x3fff : 0)) / 65535.0; palette[i].green = (((i & 2) ? 0xc000 : 0) + (i > 7 ? 0x3fff : 0)) / 65535.0;
palette[i].red = (((i & 1) ? 0xc000 : 0) + (i > 7 ? 0x3fff : 0)) / 65535.0; palette[i].red = (((i & 1) ? 0xc000 : 0) + (i > 7 ? 0x3fff : 0)) / 65535.0;
palette[i].alpha = 0;
} else if (i < 232) { } else if (i < 232) {
const unsigned j = i - 16; const unsigned j = i - 16;
const unsigned r = j / 36, g = (j / 6) % 6, b = j % 6; const unsigned r = j / 36, g = (j / 6) % 6, b = j % 6;
@ -1288,9 +1289,11 @@ static void load_theme(GtkWindow *window, VteTerminal *vte, GKeyFile *config, hi
palette[i].red = (red | red << 8) / 65535.0; palette[i].red = (red | red << 8) / 65535.0;
palette[i].green = (green | green << 8) / 65535.0; palette[i].green = (green | green << 8) / 65535.0;
palette[i].blue = (blue | blue << 8) / 65535.0; palette[i].blue = (blue | blue << 8) / 65535.0;
palette[i].alpha = 0;
} else if (i < 256) { } else if (i < 256) {
const unsigned shade = 8 + (i - 232) * 10; const unsigned shade = 8 + (i - 232) * 10;
palette[i].red = palette[i].green = palette[i].blue = (shade | shade << 8) / 65535.0; palette[i].red = palette[i].green = palette[i].blue = (shade | shade << 8) / 65535.0;
palette[i].alpha = 0;
} }
} }