Checkbox decal now scales with the size of the menu component (Fixes the "Online Mode" checkbox, which was smaller than the rest). Release Build 9660.
This commit is contained in:
parent
c8e74cb647
commit
9dcfa55407
@ -80,7 +80,9 @@ public:
|
|||||||
MenuComponent::DrawDecal(window,focused);
|
MenuComponent::DrawDecal(window,focused);
|
||||||
|
|
||||||
if(checked){
|
if(checked){
|
||||||
window.DrawDecal(rect.pos,GFX["checkmark.png"].Decal());
|
const vf2d scale{GetSize()/GFX["checkmark.png"].Sprite()->Size()};
|
||||||
|
LOG(std::format("{} / {} / {}",GFX["checkmark.png"].Sprite()->Size().str(),GetSize().str(),scale.str()));
|
||||||
|
window.DrawDecal(rect.pos,GFX["checkmark.png"].Decal(),scale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
@ -50,6 +50,7 @@ Community: https://community.onelonecoder.com
|
|||||||
|
|
||||||
#include "Pixel.h"
|
#include "Pixel.h"
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
namespace olc{
|
namespace olc{
|
||||||
// O------------------------------------------------------------------------------O
|
// O------------------------------------------------------------------------------O
|
||||||
|
@ -39,7 +39,7 @@ All rights reserved.
|
|||||||
#define VERSION_MAJOR 1
|
#define VERSION_MAJOR 1
|
||||||
#define VERSION_MINOR 2
|
#define VERSION_MINOR 2
|
||||||
#define VERSION_PATCH 3
|
#define VERSION_PATCH 3
|
||||||
#define VERSION_BUILD 9659
|
#define VERSION_BUILD 9660
|
||||||
|
|
||||||
#define stringify(a) stringify_(a)
|
#define stringify(a) stringify_(a)
|
||||||
#define stringify_(a) #a
|
#define stringify_(a) #a
|
||||||
|
@ -1,23 +1,7 @@
|
|||||||
git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
|
git update-index --assume-unchanged "Adventures in Lestoria/packkey.cpp"
|
||||||
clear
|
clear
|
||||||
rm -R bin
|
|
||||||
mkdir bin
|
mkdir bin
|
||||||
mkdir bin/assets
|
|
||||||
$ErrorActionPreference = "Stop"
|
$ErrorActionPreference = "Stop"
|
||||||
cp -R 'Adventures in Lestoria/buildtemplate.html' bin/index.html
|
|
||||||
cp -R "Adventures in Lestoria/assets/Campaigns" bin/assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/config" bin/assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/maps" bin/assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/backgrounds" bin/assets
|
|
||||||
rm -R bin/assets/backgrounds/commercial_assets
|
|
||||||
rm -R bin/assets/maps/commercial_assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/monsters" bin/assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/music" bin/assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/npcs" bin/assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/sounds" bin/assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/themes" bin/assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/gamepack.pak" bin/assets
|
|
||||||
cp -R "Adventures in Lestoria/assets/*.ttf" bin/assets
|
|
||||||
|
|
||||||
emcmake cmake -DCMAKE_BUILD_TYPE=Release .
|
emcmake cmake -DCMAKE_BUILD_TYPE=Release .
|
||||||
cmake --build . -j 20
|
cmake --build . -j 20
|
Binary file not shown.
@ -1 +0,0 @@
|
|||||||
2895980
|
|
Loading…
x
Reference in New Issue
Block a user