etc
/
furnace
mirror of https://github.com/tildearrow/furnace.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into newDispatch

This commit is contained in:
tildearrow 2023-01-04 23:03:23 -05:00
parent 48bcc6a124 8e63257756
commit 77f7fcd555
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/insEdit.cpp
View File

@ -1850,6 +1850,7 @@ void FurnaceGUI::drawMacros(std::vector<FurnaceGUIMacroDesc>& macros, FurnaceGUI
case 2: {
int columns=round(ImGui::GetContentRegionAvail().x/(400.0*dpiScale));
int curColumn=0;
if (columns<1) columns=1;
if (ImGui::BeginTable("MacroGrid",columns,ImGuiTableFlags_BordersInner)) {
for (FurnaceGUIMacroDesc& i: macros) {
if (curColumn==0) ImGui::TableNextRow();

4
src/winMain.cpp
View File

@ -22,10 +22,6 @@
typedef HRESULT (*SPDA)(int);
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prevInst, PSTR args, int state) {
if (AttachConsole(ATTACH_PARENT_PROCESS)==0) {
if (GetLastError()==ERROR_ACCESS_DENIED) FreeConsole();
}
int argc=0;
wchar_t** argw=CommandLineToArgvW(GetCommandLineW(),&argc);
char** argv=new char*[argc+1];