etc/furnace
0
0
Fork 0
mirror of https://github.com/tildearrow/furnace.git synced 2024-11-16 01:35:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'tildearrow:master' into master

Browse source
This commit is contained in:
LoKiToon 2022-05-07 08:16:12 +03:00 committed by GitHub
commit b8dc46d641
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/gui/gui.h
View file

@ -737,8 +737,6 @@ struct FurnaceGUIMacroDesc {
FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, const char* mName=NULL, String (*hf)(int,float)=NULL, bool bitfield=false, const char** bfVal=NULL, unsigned int bitOff=0): FurnaceGUIMacroDesc(const char* name, DivInstrumentMacro* m, int macroMin, int macroMax, float macroHeight, ImVec4 col=ImVec4(1.0f,1.0f,1.0f,1.0f), bool block=false, const char* mName=NULL, String (*hf)(int,float)=NULL, bool bitfield=false, const char** bfVal=NULL, unsigned int bitOff=0):
macro(m), macro(m),
min(macroMin),
max(macroMax),
height(macroHeight), height(macroHeight),
displayName(name), displayName(name),
bitfieldBits(bfVal), bitfieldBits(bfVal),
@ -748,6 +746,9 @@ struct FurnaceGUIMacroDesc {
isBitfield(bitfield), isBitfield(bitfield),
blockMode(block), blockMode(block),
hoverFunc(hf) { hoverFunc(hf) {
// MSVC -> hell
this->min=macroMin;
this->max=macroMax;
} }
}; };