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

Minor cleanup.

Browse Source
This commit is contained in:
Lymia Aluysia
2017-01-18 08:32:41 -06:00
parent d78101bcd7
commit 0f8222b345
2 changed files with 0 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Resources.sh
-23
View File
@@ -1,23 +0,0 @@
#! /bin/bash
BASEDIR=~/.magicseteditor/resource
rm -rf $BASEDIR
for DIR in $BASEDIR $BASEDIR/icon $BASEDIR/tool $BASEDIR/cursor
do
if [ -d $DIR ]; then
: ;
elif [ -a $DIR ]; then
echo $DIR "exists and is not a directory!";
exit 1 ;
else
mkdir $DIR;
fi
done
cp src/resource/common/* $BASEDIR;
cp src/resource/msw/tool/* $BASEDIR/tool;
cp src/resource/msw/icon/* $BASEDIR/icon;
cp src/resource/msw/cursor/* $BASEDIR/cursor;
cp src/resource/msw/other/* $BASEDIR;
src/data/font.cpp
-2
View File
@@ -98,12 +98,10 @@ wxFont Font::toWxFont(double scale) const {
font = wxFont(size_i, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, weight_i, underline(), italic_name()); font = wxFont(size_i, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, weight_i, underline(), italic_name());
} else { } else {
String familyName = name(); String familyName = name();
if(familyName.EndsWith(BOLD_STRING)) { if(familyName.EndsWith(BOLD_STRING)) {
familyName = familyName.Left(familyName.length() - BOLD_STRING.length()); familyName = familyName.Left(familyName.length() - BOLD_STRING.length());
weight_i = wxFONTWEIGHT_BOLD; weight_i = wxFONTWEIGHT_BOLD;
} }
font = wxFont(size_i, wxFONTFAMILY_DEFAULT, style_i, weight_i, underline(), familyName); font = wxFont(size_i, wxFONTFAMILY_DEFAULT, style_i, weight_i, underline(), familyName);
} }
// fix size // fix size