otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branches 'master' and 'k053260' of https://github.com/tildearrow/furnace into k053260

Browse source
This commit is contained in:
cam900 2023-06-26 19:47:25 +09:00
commit 7b49b4b8e0
161 changed files with 1190 additions and 864 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/gui/gui.h
View file

@ -126,6 +126,9 @@ enum FurnaceGUIColors {
GUI_COLOR_TOGGLE_ON,
GUI_COLOR_EDITING,
GUI_COLOR_SONG_LOOP,
GUI_COLOR_DESTRUCTIVE,
GUI_COLOR_WARNING,
GUI_COLOR_ERROR,
GUI_COLOR_FILE_DIR,
GUI_COLOR_FILE_SONG_NATIVE,
@ -1297,7 +1300,7 @@ class FurnaceGUI {
bool quit, warnQuit, willCommit, edit, modified, displayError, displayExporting, vgmExportLoop, zsmExportLoop, vgmExportPatternHints;
bool vgmExportDirectStream, displayInsTypeList;
bool portrait, injectBackUp, mobileMenuOpen;
bool portrait, injectBackUp, mobileMenuOpen, warnColorPushed;
bool wantCaptureKeyboard, oldWantCaptureKeyboard, displayMacroMenu;
bool displayNew, fullScreen, preserveChanPos, wantScrollList, noteInputPoly;
bool displayPendingIns, pendingInsSingle, displayPendingRawSample, snesFilterHex, modTableHex, displayEditString;
@ -1506,6 +1509,7 @@ class FurnaceGUI {
int renderClearPos;
int insertBehavior;
int pullDeleteRow;
int newSongBehavior;
unsigned int maxUndoSteps;
String mainFontPath;
String patFontPath;
@ -1657,6 +1661,7 @@ class FurnaceGUI {
renderClearPos(0),
insertBehavior(1),
pullDeleteRow(1),
newSongBehavior(0),
maxUndoSteps(100),
mainFontPath(""),
patFontPath(""),
@ -2082,6 +2087,11 @@ class FurnaceGUI {
void pushAccentColors(const ImVec4& one, const ImVec4& two, const ImVec4& border, const ImVec4& borderShadow);
void popAccentColors();
void pushDestColor();
void popDestColor();
void pushWarningColor(bool warnCond, bool errorCond=false);
void popWarningColor();
float calcBPM(const DivGroovePattern& speeds, float hz, int vN, int vD);
void patternRow(int i, bool isPlaying, float lineHeight, int chans, int ord, const DivPattern** patCache, bool inhibitSel);