Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,6 @@

*.elf
*.rpx
*.wuhb
*.wuhb

*~
2 changes: 1 addition & 1 deletion external/imgui
39 changes: 6 additions & 33 deletions src/App.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ namespace App {

bool isRunning;

static uint32_t procCallbackAcquire(void *content) {
static uint32_t procCallbackAcquire(void *) {
if (Camera::is_initialized())
Camera::open();

Expand Down Expand Up @@ -165,8 +165,9 @@ namespace App {

auto &style = ImGui::GetStyle();
style.ScaleAllSizes(3);
// style.WindowBorderSize = 0.0f;
// style.WindowPadding = {6.0f, 6.0f};

style.FramePadding = {20, 15};
style.ItemSpacing = {24, 18};

style.FrameRounding = 12.0f;
style.ChildRounding = 0.0f;
Expand All @@ -175,8 +176,8 @@ namespace App {

load_imgui_theme();

auto &colors = style.Colors;
#ifdef DEBUG_BG_COLOR
auto &colors = style.Colors;
colors[ImGuiCol_WindowBg] = {0.5, 0.0f, 0.0f, 1.0f};
#endif

Expand Down Expand Up @@ -233,17 +234,7 @@ namespace App {
cout << "Hello world from Themiify!" << endl;

initialize_imgui();
#if 0
for (int i = 0; i < SDL_NumJoysticks(); i++) {
SDL_GameController *controller = nullptr;
if (SDL_IsGameController(i)) {
controller = SDL_GameControllerOpen(i);
if (controller) {
controllers.push_back(controller);
}
}
}
#endif

Camera::initialize(renderer);
Camera::open();

Expand Down Expand Up @@ -352,24 +343,6 @@ namespace App {
}
break;
}
/*case SDL_SYSWMEVENT: {
auto *msg = e.syswm.msg;
if (!msg)
break;

switch (msg->msg.wiiu.event) {
case SDL_WIIU_SYSWM_SWKBD_OK_FINISH_EVENT: {
swkbd_ok_selected = true;
break;
}

default:
break;
}


}*/

default:
break;
}
Expand Down
Loading