Skip to content

Automated samples update #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
atg-service-acct wants to merge 1 commit into from
Closed

Automated samples update #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions Kits/ATGTK/imgui/imgui_atg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,11 +551,13 @@ namespace ImGuiAtg
{ "Triangle", ControllerGlyph::BtnTriangle },

// Xbox D-Pad
{ "DPad", ControllerGlyph::DPad },
{ "DPadUp", ControllerGlyph::DPadUp },
{ "DPadDown", ControllerGlyph::DPadDown },
{ "DPadLeft", ControllerGlyph::DPadLeft },
{ "DPadRight", ControllerGlyph::DPadRight },
{ "DPad", ControllerGlyph::DPad },
{ "DPadUp", ControllerGlyph::DPadUp },
{ "DPadDown", ControllerGlyph::DPadDown },
{ "DPadLeft", ControllerGlyph::DPadLeft },
{ "DPadRight", ControllerGlyph::DPadRight },
{ "DPadUpDown", ControllerGlyph::DPadUpDown },
{ "DPadLeftRight", ControllerGlyph::DPadLeftRight },

// Generic D-Pad
{ "Up", ControllerGlyph::Up },
Expand Down Expand Up @@ -1059,7 +1061,9 @@ namespace ImGuiAtg

void DrawLogPanel(float height, bool wrap)
{
ImGuiAtg::BeginNavigationGroup("Log");
DrawLogContent(GetState(), "Log", height, wrap);
ImGuiAtg::EndNavigationGroup();
}

void ClearLog()
Expand Down
2 changes: 2 additions & 0 deletions Kits/ATGTK/imgui/imgui_atg.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,8 @@ namespace ImGuiAtg
DPadDown = 0x227D,
DPadLeft = 0x227A,
DPadRight = 0x227C,
DPadUpDown = 0x227F,
DPadLeftRight = 0x227E,

// D-Pad (generic)
Up = 0x219F,
Expand Down
2 changes: 1 addition & 1 deletion Kits/OpenSource/imgui/imconfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
//#define IMGUI_DISABLE_DEFAULT_FORMAT_FUNCTIONS // Don't implement ImFormatString/ImFormatStringV so you can implement them yourself (e.g. if you don't want to link with vsnprintf)
//#define IMGUI_DISABLE_DEFAULT_MATH_FUNCTIONS // Don't implement ImFabs/ImSqrt/ImPow/ImFmod/ImCos/ImSin/ImAcos/ImAtan2 so you can implement them yourself.
//#define IMGUI_DISABLE_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle at all (replace them with dummies)
//#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
//#define IMGUI_DISABLE_DEFAULT_FILE_FUNCTIONS // Don't implement ImFileOpen/ImFileClose/ImFileRead/ImFileWrite and ImFileHandle so you can implement them yourself if you don't want to link with fopen/fclose/fread/fwrite. This will also disable the LogToTTY() function.
//#define IMGUI_DISABLE_DEFAULT_ALLOCATORS // Don't implement default allocators calling malloc()/free() to avoid linking with them. You will need to call ImGui::SetAllocatorFunctions().
//#define IMGUI_DISABLE_DEFAULT_FONT // Disable default embedded font (ProggyClean.ttf), remove ~9.5 KB from output binary. AddFontDefault() will assert.
//#define IMGUI_DISABLE_SSE // Disable use of SSE intrinsics even if available
Expand Down
Loading
Loading