Merge branch 'master' into newDispatch
This commit is contained in:
commit
77f7fcd555
|
@ -1850,6 +1850,7 @@ void FurnaceGUI::drawMacros(std::vector<FurnaceGUIMacroDesc>& macros, FurnaceGUI
|
||||||
case 2: {
|
case 2: {
|
||||||
int columns=round(ImGui::GetContentRegionAvail().x/(400.0*dpiScale));
|
int columns=round(ImGui::GetContentRegionAvail().x/(400.0*dpiScale));
|
||||||
int curColumn=0;
|
int curColumn=0;
|
||||||
|
if (columns<1) columns=1;
|
||||||
if (ImGui::BeginTable("MacroGrid",columns,ImGuiTableFlags_BordersInner)) {
|
if (ImGui::BeginTable("MacroGrid",columns,ImGuiTableFlags_BordersInner)) {
|
||||||
for (FurnaceGUIMacroDesc& i: macros) {
|
for (FurnaceGUIMacroDesc& i: macros) {
|
||||||
if (curColumn==0) ImGui::TableNextRow();
|
if (curColumn==0) ImGui::TableNextRow();
|
||||||
|
|
|
@ -22,10 +22,6 @@
|
||||||
typedef HRESULT (*SPDA)(int);
|
typedef HRESULT (*SPDA)(int);
|
||||||
|
|
||||||
int WINAPI WinMain(HINSTANCE inst, HINSTANCE prevInst, PSTR args, int state) {
|
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;
|
int argc=0;
|
||||||
wchar_t** argw=CommandLineToArgvW(GetCommandLineW(),&argc);
|
wchar_t** argw=CommandLineToArgvW(GetCommandLineW(),&argc);
|
||||||
char** argv=new char*[argc+1];
|
char** argv=new char*[argc+1];
|
||||||
|
|
Loading…
Reference in New Issue