diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/app.cpp | 2 | ||||
| -rw-r--r-- | main/imgui.cpp | 4 | ||||
| -rw-r--r-- | main/precomp.hpp | 18 |
3 files changed, 20 insertions, 4 deletions
diff --git a/main/app.cpp b/main/app.cpp index a9523548..92ac68dc 100644 --- a/main/app.cpp +++ b/main/app.cpp @@ -79,7 +79,7 @@ app::app(const Arguments& arguments, app_settings opts): void app::recalc_viewport(Vector2i size) { _shader.set_scale(Vector2(size)); - _imgui.relayout(Vector2{ size }, size, size); + _imgui.relayout(Vector2{size}, size, size); _cursor_pixel = std::nullopt; recalc_cursor_tile(); diff --git a/main/imgui.cpp b/main/imgui.cpp index ea64cd85..db4f321b 100644 --- a/main/imgui.cpp +++ b/main/imgui.cpp @@ -88,7 +88,7 @@ void app::draw_editor_pane(tile_type& type, float main_menu_height) { ImGui::SetNextWindowPos({0, main_menu_height+style.WindowPadding.y}); ImGui::SetNextFrameWantCaptureKeyboard(false); - ImGui::SetNextWindowSize({440, windowSize()[1] - main_menu_height - style.WindowPadding.y}); + ImGui::SetNextWindowSize({420, windowSize()[1] - main_menu_height - style.WindowPadding.y}); if (const auto flags = ImGuiWindowFlags_(ImGuiWindowFlags_NoDecoration | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoSavedSettings); auto b = begin_window({}, flags)) { @@ -124,7 +124,7 @@ void app::draw_editor_pane(tile_type& type, float main_menu_height) push_style_color(ImGuiCol_ButtonHovered, color_hover), }; const bool perm_selected = ed ? ed->is_permutation_selected(v) : false; - constexpr std::size_t per_row = 5; + constexpr std::size_t per_row = 8; for (std::size_t i = 0; i < N; i++) { const bool selected = ed ? ed->is_tile_selected(v, i) : false; diff --git a/main/precomp.hpp b/main/precomp.hpp index b38f46f9..1dc47507 100644 --- a/main/precomp.hpp +++ b/main/precomp.hpp @@ -1,3 +1,19 @@ #pragma once #include "src/precomp.hpp" -#include "app.hpp" + +#include <Corrade/Utility/Arguments.h> +#include <Corrade/Utility/DebugStl.h> + +#include <Magnum/ImageFlags.h> +#include <Magnum/ImageView.h> +#include <Magnum/PixelFormat.h> +#include <Magnum/PixelStorage.h> +#include <Magnum/Timeline.h> + +#include <Magnum/GL/DebugOutput.h> +#include <Magnum/GL/DefaultFramebuffer.h> +#include <Magnum/GL/Framebuffer.h> +#include <Magnum/GL/MultisampleTexture.h> +#include <Magnum/GL/TextureFormat.h> +#include <Magnum/ImGuiIntegration/Context.h> +#include <Magnum/Platform/Sdl2Application.h> |