amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-11 05:07:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove AColor class, because wxColour now supports alpha values.

Browse Source
This commit is contained in:
Twan van Laarhoven
2020-04-23 22:59:29 +02:00
parent 1fe145864e
commit 4258ce1c6c
25 changed files with 94 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/set/console_panel.cpp
+2 -2
View File
@@ -510,10 +510,10 @@ void ConsolePanel::exec(String const& command) {
message->bitmap = wxBitmap(image);
} else if (type == SCRIPT_COLOR) {
message->text = result->toCode();
AColor color = (AColor)*result;
Color color = (Color)*result;
wxImage image(30,20);
fill_image(image,color);
set_alpha(image, color.alpha / 255.0);
set_alpha(image, color.Alpha() / 255.0);
message->bitmap = wxBitmap(image);
} else {
message->text = result->toCode();
src/gui/symbol/part_list.cpp
+1 -1
View File
@@ -517,7 +517,7 @@ const Image& SymbolPartList::itemPreview(int i, const SymbolPartP& part) {
}
const Image& SymbolPartList::symbolPreview() {
if (!symbol_preview.up_to_date) {
SolidFillSymbolFilter filter(AColor(0,0,0,40), AColor(255,255,255,40));
SolidFillSymbolFilter filter(Color(0,0,0,40), Color(255,255,255,40));
Image img = render_symbol(symbol, filter, 0.06, ITEM_HEIGHT * 4);
resample(img, symbol_preview.image);
symbol_preview.up_to_date = true;