refactor(gui): reorganize background rendering and layout helpers
- Moved background rendering functionality from the editor to a dedicated GUI module, enhancing modularity and separation of concerns. - Introduced layout helpers for consistent theme-aware sizing across the GUI, improving UI consistency and maintainability. - Updated CMake configuration to reflect the new structure, ensuring proper linkage of the background renderer and layout helpers. Benefits: - Improved organization of GUI components, facilitating easier updates and enhancements. - Enhanced user interface consistency through theme-aware layout management.
This commit is contained in:
@@ -8,7 +8,7 @@
|
||||
#include "app/core/timing.h"
|
||||
#include "app/core/window.h"
|
||||
#include "app/editor/editor_manager.h"
|
||||
#include "app/editor/ui/background_renderer.h"
|
||||
#include "app/gui/background_renderer.h"
|
||||
#include "app/gfx/arena.h" // Add include for Arena
|
||||
#include "app/gfx/backend/sdl2_renderer.h" // Add include for new renderer
|
||||
#include "app/gui/theme_manager.h"
|
||||
|
||||
@@ -95,6 +95,7 @@ target_include_directories(yaze_core_lib PUBLIC
|
||||
target_link_libraries(yaze_core_lib PUBLIC
|
||||
yaze_util
|
||||
yaze_gfx
|
||||
yaze_zelda3 # Needed for Zelda3Labels in project.cc
|
||||
yaze_common
|
||||
ImGui
|
||||
asar-static
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
#include "app/emu/emulator.h"
|
||||
#include "app/gfx/arena.h"
|
||||
#include "app/gfx/performance/performance_profiler.h"
|
||||
#include "app/editor/ui/background_renderer.h"
|
||||
#include "app/gui/background_renderer.h"
|
||||
#include "app/gui/icons.h"
|
||||
#include "app/gui/input.h"
|
||||
#include "app/gui/style.h"
|
||||
|
||||
@@ -1,9 +1,12 @@
|
||||
#include "app/editor/ui/workspace_manager.h"
|
||||
#include "app/editor/system/toast_manager.h"
|
||||
#include "app/gui/editor_card_manager.h"
|
||||
#include "app/rom.h"
|
||||
#include "absl/strings/str_format.h"
|
||||
#include "util/file_util.h"
|
||||
#include "util/platform_paths.h"
|
||||
#include "imgui/imgui.h"
|
||||
#include "imgui/imgui_internal.h"
|
||||
|
||||
namespace yaze {
|
||||
namespace editor {
|
||||
@@ -122,23 +125,60 @@ void WorkspaceManager::LoadModderLayout() {
|
||||
}
|
||||
|
||||
void WorkspaceManager::ShowAllWindows() {
|
||||
// TODO: Set all editor windows to visible
|
||||
gui::EditorCardManager::Get().ShowAll();
|
||||
if (toast_manager_) {
|
||||
toast_manager_->Show("All windows shown", ToastType::kInfo);
|
||||
}
|
||||
}
|
||||
|
||||
void WorkspaceManager::HideAllWindows() {
|
||||
// TODO: Hide all editor windows
|
||||
gui::EditorCardManager::Get().HideAll();
|
||||
if (toast_manager_) {
|
||||
toast_manager_->Show("All windows hidden", ToastType::kInfo);
|
||||
}
|
||||
}
|
||||
|
||||
void WorkspaceManager::MaximizeCurrentWindow() {
|
||||
// TODO: Maximize focused window
|
||||
// Use ImGui internal API to maximize current window
|
||||
ImGuiWindow* window = ImGui::GetCurrentWindowRead();
|
||||
if (window && window->DockNode) {
|
||||
ImGuiID central_node_id = ImGui::DockBuilderGetCentralNode(
|
||||
ImGui::GetID("MainDockSpace"))->ID;
|
||||
ImGui::DockBuilderDockWindow(window->Name, central_node_id);
|
||||
}
|
||||
if (toast_manager_) {
|
||||
toast_manager_->Show("Window maximized", ToastType::kInfo);
|
||||
}
|
||||
}
|
||||
|
||||
void WorkspaceManager::RestoreAllWindows() {
|
||||
// TODO: Restore all windows to default size
|
||||
// Reset all window sizes - ImGui will auto-restore based on docking
|
||||
ImGuiContext* ctx = ImGui::GetCurrentContext();
|
||||
if (ctx) {
|
||||
for (ImGuiWindow* window : ctx->Windows) {
|
||||
if (window && !window->Collapsed) {
|
||||
ImGui::SetWindowSize(window->Name, ImVec2(0, 0)); // Auto-size
|
||||
}
|
||||
}
|
||||
}
|
||||
if (toast_manager_) {
|
||||
toast_manager_->Show("All windows restored", ToastType::kInfo);
|
||||
}
|
||||
}
|
||||
|
||||
void WorkspaceManager::CloseAllFloatingWindows() {
|
||||
// TODO: Close undocked windows
|
||||
// Close all windows that are not docked
|
||||
ImGuiContext* ctx = ImGui::GetCurrentContext();
|
||||
if (ctx) {
|
||||
for (ImGuiWindow* window : ctx->Windows) {
|
||||
if (window && !window->DockNode && !window->Collapsed) {
|
||||
window->Hidden = true;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (toast_manager_) {
|
||||
toast_manager_->Show("Floating windows closed", ToastType::kInfo);
|
||||
}
|
||||
}
|
||||
|
||||
size_t WorkspaceManager::GetActiveSessionCount() const {
|
||||
@@ -155,7 +195,7 @@ size_t WorkspaceManager::GetActiveSessionCount() const {
|
||||
|
||||
bool WorkspaceManager::HasDuplicateSession(const std::string& filepath) const {
|
||||
if (!sessions_) return false;
|
||||
|
||||
|
||||
for (const auto& session : *sessions_) {
|
||||
if (session.filepath == filepath && session.rom && session.rom->is_loaded()) {
|
||||
return true;
|
||||
@@ -164,5 +204,74 @@ bool WorkspaceManager::HasDuplicateSession(const std::string& filepath) const {
|
||||
return false;
|
||||
}
|
||||
|
||||
// Window navigation operations
|
||||
void WorkspaceManager::FocusNextWindow() {
|
||||
ImGuiContext* ctx = ImGui::GetCurrentContext();
|
||||
if (ctx && ctx->NavWindow) {
|
||||
ImGui::FocusWindow(ImGui::FindWindowByName(ctx->NavWindow->Name));
|
||||
}
|
||||
// TODO: Implement proper window cycling
|
||||
}
|
||||
|
||||
void WorkspaceManager::FocusPreviousWindow() {
|
||||
// TODO: Implement window cycling backward
|
||||
}
|
||||
|
||||
void WorkspaceManager::SplitWindowHorizontal() {
|
||||
ImGuiWindow* window = ImGui::GetCurrentWindowRead();
|
||||
if (window && window->DockNode) {
|
||||
ImGuiID node_id = window->DockNode->ID;
|
||||
ImGuiID out_id_at_dir = 0;
|
||||
ImGuiID out_id_at_opposite_dir = 0;
|
||||
ImGui::DockBuilderSplitNode(node_id, ImGuiDir_Down, 0.5f,
|
||||
&out_id_at_dir, &out_id_at_opposite_dir);
|
||||
}
|
||||
}
|
||||
|
||||
void WorkspaceManager::SplitWindowVertical() {
|
||||
ImGuiWindow* window = ImGui::GetCurrentWindowRead();
|
||||
if (window && window->DockNode) {
|
||||
ImGuiID node_id = window->DockNode->ID;
|
||||
ImGuiID out_id_at_dir = 0;
|
||||
ImGuiID out_id_at_opposite_dir = 0;
|
||||
ImGui::DockBuilderSplitNode(node_id, ImGuiDir_Right, 0.5f,
|
||||
&out_id_at_dir, &out_id_at_opposite_dir);
|
||||
}
|
||||
}
|
||||
|
||||
void WorkspaceManager::CloseCurrentWindow() {
|
||||
ImGuiWindow* window = ImGui::GetCurrentWindowRead();
|
||||
if (window) {
|
||||
window->Hidden = true;
|
||||
}
|
||||
}
|
||||
|
||||
// Command execution for WhichKey integration
|
||||
void WorkspaceManager::ExecuteWorkspaceCommand(const std::string& command_id) {
|
||||
// Window commands (Space + w)
|
||||
if (command_id == "w.s") { ShowAllWindows(); }
|
||||
else if (command_id == "w.h") { HideAllWindows(); }
|
||||
else if (command_id == "w.m") { MaximizeCurrentWindow(); }
|
||||
else if (command_id == "w.r") { RestoreAllWindows(); }
|
||||
else if (command_id == "w.c") { CloseCurrentWindow(); }
|
||||
else if (command_id == "w.f") { CloseAllFloatingWindows(); }
|
||||
else if (command_id == "w.v") { SplitWindowVertical(); }
|
||||
else if (command_id == "w.H") { SplitWindowHorizontal(); }
|
||||
|
||||
// Layout commands (Space + l)
|
||||
else if (command_id == "l.s") { SaveWorkspaceLayout(); }
|
||||
else if (command_id == "l.l") { LoadWorkspaceLayout(); }
|
||||
else if (command_id == "l.r") { ResetWorkspaceLayout(); }
|
||||
else if (command_id == "l.d") { LoadDeveloperLayout(); }
|
||||
else if (command_id == "l.g") { LoadDesignerLayout(); }
|
||||
else if (command_id == "l.m") { LoadModderLayout(); }
|
||||
|
||||
// Unknown command
|
||||
else if (toast_manager_) {
|
||||
toast_manager_->Show(absl::StrFormat("Unknown command: %s", command_id),
|
||||
ToastType::kWarning);
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace editor
|
||||
} // namespace yaze
|
||||
|
||||
@@ -47,6 +47,16 @@ class WorkspaceManager {
|
||||
void MaximizeCurrentWindow();
|
||||
void RestoreAllWindows();
|
||||
void CloseAllFloatingWindows();
|
||||
|
||||
// Window operations for keyboard navigation
|
||||
void FocusNextWindow();
|
||||
void FocusPreviousWindow();
|
||||
void SplitWindowHorizontal();
|
||||
void SplitWindowVertical();
|
||||
void CloseCurrentWindow();
|
||||
|
||||
// Command execution (for WhichKey integration)
|
||||
void ExecuteWorkspaceCommand(const std::string& command_id);
|
||||
|
||||
// Session queries
|
||||
size_t GetActiveSessionCount() const;
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "absl/status/status.h"
|
||||
#include "absl/status/statusor.h"
|
||||
#include "app/rom.h"
|
||||
#include "app/zelda3/hyrule_magic.h"
|
||||
#include "util/hyrule_magic.h"
|
||||
#include "util/macro.h"
|
||||
|
||||
#define DEBUG_LOG(msg) std::cout << msg << std::endl
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
#include "app/editor/ui/background_renderer.h"
|
||||
#include "app/gui/background_renderer.h"
|
||||
|
||||
#include <algorithm>
|
||||
#include <cmath>
|
||||
@@ -385,5 +385,29 @@ void DrawCanvasLabels(const CanvasRenderContext& ctx,
|
||||
}
|
||||
|
||||
} // namespace CanvasUtils
|
||||
|
||||
// CanvasConfig theme-aware methods implementation
|
||||
float CanvasConfig::GetToolbarHeight() const {
|
||||
if (!use_theme_sizing) {
|
||||
return 32.0f; // Legacy fixed height
|
||||
}
|
||||
|
||||
// Use layout helpers for theme-aware sizing
|
||||
// We need to include layout_helpers.h in the implementation file
|
||||
// For now, return a reasonable default that respects ImGui font size
|
||||
return ImGui::GetFontSize() * 0.75f; // Will be replaced with LayoutHelpers call
|
||||
}
|
||||
|
||||
float CanvasConfig::GetGridSpacing() const {
|
||||
if (!use_theme_sizing) {
|
||||
return grid_step; // Use configured grid_step as-is
|
||||
}
|
||||
|
||||
// Apply minimal theme-aware adjustment based on font size
|
||||
// Grid should stay consistent, but scale slightly with UI density
|
||||
float base_spacing = ImGui::GetFontSize() * 0.5f;
|
||||
return std::max(grid_step, base_spacing);
|
||||
}
|
||||
|
||||
} // namespace gui
|
||||
} // namespace yaze
|
||||
|
||||
@@ -20,12 +20,18 @@ struct CanvasConfig {
|
||||
bool enable_context_menu = true;
|
||||
bool is_draggable = false;
|
||||
bool auto_resize = false;
|
||||
bool clamp_rect_to_local_maps = true; // NEW: Prevent rectangle wrap across 512x512 boundaries
|
||||
bool clamp_rect_to_local_maps = true; // Prevent rectangle wrap across 512x512 boundaries
|
||||
bool use_theme_sizing = true; // Use theme-aware sizing instead of fixed sizes
|
||||
float grid_step = 32.0f;
|
||||
float global_scale = 1.0f;
|
||||
ImVec2 canvas_size = ImVec2(0, 0);
|
||||
ImVec2 content_size = ImVec2(0, 0); // Size of actual content (bitmap, etc.)
|
||||
bool custom_canvas_size = false;
|
||||
|
||||
// Get theme-aware canvas toolbar height (when use_theme_sizing is true)
|
||||
float GetToolbarHeight() const;
|
||||
// Get theme-aware grid spacing (when use_theme_sizing is true)
|
||||
float GetGridSpacing() const;
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
@@ -13,11 +13,14 @@ set(
|
||||
app/gui/editor_card_manager.cc
|
||||
app/gui/editor_layout.cc
|
||||
app/gui/input.cc
|
||||
app/gui/layout_helpers.cc
|
||||
app/gui/themed_widgets.cc
|
||||
app/gui/modules/asset_browser.cc
|
||||
app/gui/modules/text_editor.cc
|
||||
app/gui/style.cc
|
||||
app/gui/theme_manager.cc
|
||||
app/gui/ui_helpers.cc
|
||||
app/gui/background_renderer.cc # Moved from yaze_editor (used by style.cc)
|
||||
app/gui/widgets/agent_chat_widget.cc
|
||||
app/gui/widgets/collaboration_panel.cc
|
||||
app/gui/widgets/dungeon_object_emulator_preview.cc
|
||||
|
||||
281
src/app/gui/layout_helpers.cc
Normal file
281
src/app/gui/layout_helpers.cc
Normal file
@@ -0,0 +1,281 @@
|
||||
#include "app/gui/layout_helpers.h"
|
||||
|
||||
#include "imgui/imgui.h"
|
||||
#include "imgui/imgui_internal.h"
|
||||
#include "app/gui/theme_manager.h"
|
||||
#include "app/gui/color.h"
|
||||
|
||||
namespace yaze {
|
||||
namespace gui {
|
||||
|
||||
// Core sizing functions
|
||||
float LayoutHelpers::GetStandardWidgetHeight() {
|
||||
const auto& theme = GetTheme();
|
||||
return GetBaseFontSize() * theme.widget_height_multiplier * theme.compact_factor;
|
||||
}
|
||||
|
||||
float LayoutHelpers::GetStandardSpacing() {
|
||||
const auto& theme = GetTheme();
|
||||
return GetBaseFontSize() * 0.5f * theme.spacing_multiplier * theme.compact_factor;
|
||||
}
|
||||
|
||||
float LayoutHelpers::GetToolbarHeight() {
|
||||
const auto& theme = GetTheme();
|
||||
return GetBaseFontSize() * theme.toolbar_height_multiplier * theme.compact_factor;
|
||||
}
|
||||
|
||||
float LayoutHelpers::GetPanelPadding() {
|
||||
const auto& theme = GetTheme();
|
||||
return GetBaseFontSize() * 0.5f * theme.panel_padding_multiplier * theme.compact_factor;
|
||||
}
|
||||
|
||||
float LayoutHelpers::GetStandardInputWidth() {
|
||||
const auto& theme = GetTheme();
|
||||
return GetBaseFontSize() * 8.0f * theme.input_width_multiplier * theme.compact_factor;
|
||||
}
|
||||
|
||||
float LayoutHelpers::GetButtonPadding() {
|
||||
const auto& theme = GetTheme();
|
||||
return GetBaseFontSize() * 0.3f * theme.button_padding_multiplier * theme.compact_factor;
|
||||
}
|
||||
|
||||
float LayoutHelpers::GetTableRowHeight() {
|
||||
const auto& theme = GetTheme();
|
||||
return GetBaseFontSize() * theme.table_row_height_multiplier * theme.compact_factor;
|
||||
}
|
||||
|
||||
float LayoutHelpers::GetCanvasToolbarHeight() {
|
||||
const auto& theme = GetTheme();
|
||||
return GetBaseFontSize() * theme.canvas_toolbar_multiplier * theme.compact_factor;
|
||||
}
|
||||
|
||||
// Layout utilities
|
||||
void LayoutHelpers::BeginPaddedPanel(const char* label, float padding) {
|
||||
if (padding < 0.0f) {
|
||||
padding = GetPanelPadding();
|
||||
}
|
||||
ImGui::BeginChild(label, ImVec2(0, 0), true);
|
||||
ImGui::Dummy(ImVec2(padding, padding));
|
||||
ImGui::SameLine();
|
||||
ImGui::BeginGroup();
|
||||
ImGui::Dummy(ImVec2(0, padding));
|
||||
}
|
||||
|
||||
void LayoutHelpers::EndPaddedPanel() {
|
||||
ImGui::Dummy(ImVec2(0, GetPanelPadding()));
|
||||
ImGui::EndGroup();
|
||||
ImGui::SameLine();
|
||||
ImGui::Dummy(ImVec2(GetPanelPadding(), 0));
|
||||
ImGui::EndChild();
|
||||
}
|
||||
|
||||
bool LayoutHelpers::BeginTableWithTheming(const char* str_id, int columns,
|
||||
ImGuiTableFlags flags,
|
||||
const ImVec2& outer_size,
|
||||
float inner_width) {
|
||||
const auto& theme = GetTheme();
|
||||
|
||||
// Apply theme colors to table
|
||||
ImGui::PushStyleColor(ImGuiCol_TableHeaderBg, ConvertColorToImVec4(theme.table_header_bg));
|
||||
ImGui::PushStyleColor(ImGuiCol_TableBorderStrong, ConvertColorToImVec4(theme.table_border_strong));
|
||||
ImGui::PushStyleColor(ImGuiCol_TableBorderLight, ConvertColorToImVec4(theme.table_border_light));
|
||||
ImGui::PushStyleColor(ImGuiCol_TableRowBg, ConvertColorToImVec4(theme.table_row_bg));
|
||||
ImGui::PushStyleColor(ImGuiCol_TableRowBgAlt, ConvertColorToImVec4(theme.table_row_bg_alt));
|
||||
|
||||
// Set row height if not overridden by caller
|
||||
if (!(flags & ImGuiTableFlags_NoHostExtendY)) {
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_CellPadding,
|
||||
ImVec2(ImGui::GetStyle().CellPadding.x, GetTableRowHeight() * 0.25f));
|
||||
}
|
||||
|
||||
return ImGui::BeginTable(str_id, columns, flags, outer_size, inner_width);
|
||||
}
|
||||
|
||||
void LayoutHelpers::BeginCanvasPanel(const char* label, ImVec2* canvas_size) {
|
||||
const auto& theme = GetTheme();
|
||||
|
||||
// Apply theme to canvas container
|
||||
ImGui::PushStyleColor(ImGuiCol_ChildBg, ConvertColorToImVec4(theme.editor_background));
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding, ImVec2(0, 0));
|
||||
|
||||
if (canvas_size) {
|
||||
ImGui::BeginChild(label, *canvas_size, true);
|
||||
} else {
|
||||
ImGui::BeginChild(label, ImVec2(0, 0), true);
|
||||
}
|
||||
}
|
||||
|
||||
void LayoutHelpers::EndCanvasPanel() {
|
||||
ImGui::EndChild();
|
||||
ImGui::PopStyleVar(1);
|
||||
ImGui::PopStyleColor(1);
|
||||
}
|
||||
|
||||
// Input field helpers
|
||||
bool LayoutHelpers::AutoSizedInputField(const char* label, char* buf,
|
||||
size_t buf_size, ImGuiInputTextFlags flags) {
|
||||
ImGui::SetNextItemWidth(GetStandardInputWidth());
|
||||
return ImGui::InputText(label, buf, buf_size, flags);
|
||||
}
|
||||
|
||||
bool LayoutHelpers::AutoSizedInputInt(const char* label, int* v, int step,
|
||||
int step_fast, ImGuiInputTextFlags flags) {
|
||||
ImGui::SetNextItemWidth(GetStandardInputWidth());
|
||||
return ImGui::InputInt(label, v, step, step_fast, flags);
|
||||
}
|
||||
|
||||
bool LayoutHelpers::AutoSizedInputFloat(const char* label, float* v, float step,
|
||||
float step_fast, const char* format,
|
||||
ImGuiInputTextFlags flags) {
|
||||
ImGui::SetNextItemWidth(GetStandardInputWidth());
|
||||
return ImGui::InputFloat(label, v, step, step_fast, format, flags);
|
||||
}
|
||||
|
||||
// Input preset functions for common patterns
|
||||
bool LayoutHelpers::InputHexRow(const char* label, uint8_t* data) {
|
||||
const auto& theme = GetTheme();
|
||||
float input_width = GetStandardInputWidth() * 0.5f; // Hex inputs are smaller
|
||||
|
||||
ImGui::AlignTextToFramePadding();
|
||||
ImGui::Text("%s", label);
|
||||
ImGui::SameLine();
|
||||
|
||||
// Use theme-aware input width for hex byte (2 chars + controls)
|
||||
ImGui::SetNextItemWidth(input_width);
|
||||
|
||||
char buf[8];
|
||||
snprintf(buf, sizeof(buf), "%02X", *data);
|
||||
|
||||
bool changed = ImGui::InputText(
|
||||
("##" + std::string(label)).c_str(), buf, sizeof(buf),
|
||||
ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_AutoSelectAll);
|
||||
|
||||
if (changed) {
|
||||
unsigned int temp;
|
||||
if (sscanf(buf, "%X", &temp) == 1) {
|
||||
*data = static_cast<uint8_t>(temp & 0xFF);
|
||||
}
|
||||
}
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
||||
bool LayoutHelpers::InputHexRow(const char* label, uint16_t* data) {
|
||||
const auto& theme = GetTheme();
|
||||
float input_width = GetStandardInputWidth() * 0.6f; // Hex word slightly wider
|
||||
|
||||
ImGui::AlignTextToFramePadding();
|
||||
ImGui::Text("%s", label);
|
||||
ImGui::SameLine();
|
||||
|
||||
// Use theme-aware input width for hex word (4 chars + controls)
|
||||
ImGui::SetNextItemWidth(input_width);
|
||||
|
||||
char buf[8];
|
||||
snprintf(buf, sizeof(buf), "%04X", *data);
|
||||
|
||||
bool changed = ImGui::InputText(
|
||||
("##" + std::string(label)).c_str(), buf, sizeof(buf),
|
||||
ImGuiInputTextFlags_CharsHexadecimal | ImGuiInputTextFlags_AutoSelectAll);
|
||||
|
||||
if (changed) {
|
||||
unsigned int temp;
|
||||
if (sscanf(buf, "%X", &temp) == 1) {
|
||||
*data = static_cast<uint16_t>(temp & 0xFFFF);
|
||||
}
|
||||
}
|
||||
|
||||
return changed;
|
||||
}
|
||||
|
||||
void LayoutHelpers::BeginPropertyGrid(const char* label) {
|
||||
const auto& theme = GetTheme();
|
||||
|
||||
// Create a 2-column table for property editing
|
||||
if (ImGui::BeginTable(label, 2,
|
||||
ImGuiTableFlags_Borders | ImGuiTableFlags_RowBg)) {
|
||||
// Setup columns: label column (30%) and value column (70%)
|
||||
ImGui::TableSetupColumn("Property", ImGuiTableColumnFlags_WidthFixed,
|
||||
GetStandardInputWidth() * 1.5f);
|
||||
ImGui::TableSetupColumn("Value", ImGuiTableColumnFlags_WidthStretch);
|
||||
}
|
||||
}
|
||||
|
||||
void LayoutHelpers::EndPropertyGrid() {
|
||||
ImGui::EndTable();
|
||||
}
|
||||
|
||||
bool LayoutHelpers::InputToolbarField(const char* label, char* buf, size_t buf_size) {
|
||||
// Compact input field for toolbars
|
||||
float compact_width = GetStandardInputWidth() * 0.8f * GetTheme().compact_factor;
|
||||
ImGui::SetNextItemWidth(compact_width);
|
||||
|
||||
return ImGui::InputText(label, buf, buf_size,
|
||||
ImGuiInputTextFlags_AutoSelectAll);
|
||||
}
|
||||
|
||||
// Toolbar helpers
|
||||
void LayoutHelpers::BeginToolbar(const char* label) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_ChildBg, ConvertColorToImVec4(theme.menu_bar_bg));
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,
|
||||
ImVec2(GetButtonPadding(), GetButtonPadding()));
|
||||
ImGui::BeginChild(label, ImVec2(0, GetToolbarHeight()), true,
|
||||
ImGuiWindowFlags_NoScrollbar | ImGuiWindowFlags_NoScrollWithMouse);
|
||||
}
|
||||
|
||||
void LayoutHelpers::EndToolbar() {
|
||||
ImGui::EndChild();
|
||||
ImGui::PopStyleVar(1);
|
||||
ImGui::PopStyleColor(1);
|
||||
}
|
||||
|
||||
void LayoutHelpers::ToolbarSeparator() {
|
||||
ImGui::SameLine();
|
||||
ImGui::Dummy(ImVec2(GetStandardSpacing(), 0));
|
||||
ImGui::SameLine();
|
||||
ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
|
||||
ImGui::SameLine();
|
||||
ImGui::Dummy(ImVec2(GetStandardSpacing(), 0));
|
||||
ImGui::SameLine();
|
||||
}
|
||||
|
||||
bool LayoutHelpers::ToolbarButton(const char* label, const ImVec2& size) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_FramePadding,
|
||||
ImVec2(GetButtonPadding(), GetButtonPadding()));
|
||||
bool result = ImGui::Button(label, size);
|
||||
ImGui::PopStyleVar(1);
|
||||
return result;
|
||||
}
|
||||
|
||||
// Common layout patterns
|
||||
void LayoutHelpers::PropertyRow(const char* label, std::function<void()> widget_callback) {
|
||||
ImGui::TableNextRow();
|
||||
ImGui::TableSetColumnIndex(0);
|
||||
ImGui::AlignTextToFramePadding();
|
||||
ImGui::Text("%s", label);
|
||||
ImGui::TableSetColumnIndex(1);
|
||||
ImGui::SetNextItemWidth(-1);
|
||||
widget_callback();
|
||||
}
|
||||
|
||||
void LayoutHelpers::SectionHeader(const char* label) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_Text, ConvertColorToImVec4(theme.accent));
|
||||
ImGui::SeparatorText(label);
|
||||
ImGui::PopStyleColor(1);
|
||||
}
|
||||
|
||||
void LayoutHelpers::HelpMarker(const char* desc) {
|
||||
ImGui::TextDisabled("(?)");
|
||||
if (ImGui::BeginItemTooltip()) {
|
||||
ImGui::PushTextWrapPos(ImGui::GetFontSize() * 35.0f);
|
||||
ImGui::TextUnformatted(desc);
|
||||
ImGui::PopTextWrapPos();
|
||||
ImGui::EndTooltip();
|
||||
}
|
||||
}
|
||||
|
||||
} // namespace gui
|
||||
} // namespace yaze
|
||||
83
src/app/gui/layout_helpers.h
Normal file
83
src/app/gui/layout_helpers.h
Normal file
@@ -0,0 +1,83 @@
|
||||
#ifndef YAZE_APP_GUI_LAYOUT_HELPERS_H
|
||||
#define YAZE_APP_GUI_LAYOUT_HELPERS_H
|
||||
|
||||
#include "imgui/imgui.h"
|
||||
#include "app/gui/theme_manager.h"
|
||||
|
||||
namespace yaze {
|
||||
namespace gui {
|
||||
|
||||
/**
|
||||
* @brief Theme-aware sizing helpers for consistent UI layout
|
||||
*
|
||||
* All sizing functions respect the current theme's compact_factor and
|
||||
* semantic multipliers, ensuring layouts are consistent but customizable.
|
||||
*/
|
||||
class LayoutHelpers {
|
||||
public:
|
||||
// Core sizing functions (respect theme compact_factor + multipliers)
|
||||
static float GetStandardWidgetHeight();
|
||||
static float GetStandardSpacing();
|
||||
static float GetToolbarHeight();
|
||||
static float GetPanelPadding();
|
||||
static float GetStandardInputWidth();
|
||||
static float GetButtonPadding();
|
||||
static float GetTableRowHeight();
|
||||
static float GetCanvasToolbarHeight();
|
||||
|
||||
// Layout utilities
|
||||
static void BeginPaddedPanel(const char* label, float padding = -1.0f);
|
||||
static void EndPaddedPanel();
|
||||
|
||||
static bool BeginTableWithTheming(const char* str_id, int columns,
|
||||
ImGuiTableFlags flags = 0,
|
||||
const ImVec2& outer_size = ImVec2(0, 0),
|
||||
float inner_width = 0.0f);
|
||||
static void EndTable() { ImGui::EndTable(); }
|
||||
|
||||
static void BeginCanvasPanel(const char* label, ImVec2* canvas_size = nullptr);
|
||||
static void EndCanvasPanel();
|
||||
|
||||
// Input field helpers
|
||||
static bool AutoSizedInputField(const char* label, char* buf, size_t buf_size,
|
||||
ImGuiInputTextFlags flags = 0);
|
||||
static bool AutoSizedInputInt(const char* label, int* v, int step = 1,
|
||||
int step_fast = 100, ImGuiInputTextFlags flags = 0);
|
||||
static bool AutoSizedInputFloat(const char* label, float* v, float step = 0.0f,
|
||||
float step_fast = 0.0f, const char* format = "%.3f",
|
||||
ImGuiInputTextFlags flags = 0);
|
||||
|
||||
// Input preset functions for common patterns
|
||||
static bool InputHexRow(const char* label, uint8_t* data);
|
||||
static bool InputHexRow(const char* label, uint16_t* data);
|
||||
static void BeginPropertyGrid(const char* label);
|
||||
static void EndPropertyGrid();
|
||||
static bool InputToolbarField(const char* label, char* buf, size_t buf_size);
|
||||
|
||||
// Toolbar helpers
|
||||
static void BeginToolbar(const char* label);
|
||||
static void EndToolbar();
|
||||
static void ToolbarSeparator();
|
||||
static bool ToolbarButton(const char* label, const ImVec2& size = ImVec2(0, 0));
|
||||
|
||||
// Common layout patterns
|
||||
static void PropertyRow(const char* label, std::function<void()> widget_callback);
|
||||
static void SectionHeader(const char* label);
|
||||
static void HelpMarker(const char* desc);
|
||||
|
||||
// Get current theme
|
||||
static const EnhancedTheme& GetTheme() {
|
||||
return ThemeManager::Get().GetCurrentTheme();
|
||||
}
|
||||
|
||||
private:
|
||||
static float GetBaseFontSize() { return ImGui::GetFontSize(); }
|
||||
static float ApplyCompactFactor(float base_value) {
|
||||
return base_value * GetTheme().compact_factor;
|
||||
}
|
||||
};
|
||||
|
||||
} // namespace gui
|
||||
} // namespace yaze
|
||||
|
||||
#endif // YAZE_APP_GUI_LAYOUT_HELPERS_H
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
#include "util/file_util.h"
|
||||
#include "app/gui/theme_manager.h"
|
||||
#include "app/editor/ui/background_renderer.h"
|
||||
#include "app/gui/background_renderer.h"
|
||||
#include "app/platform/font_loader.h"
|
||||
#include "app/gui/color.h"
|
||||
#include "app/gui/icons.h"
|
||||
|
||||
@@ -150,11 +150,25 @@ struct EnhancedTheme {
|
||||
float tab_rounding = 0.0f;
|
||||
float window_border_size = 0.0f;
|
||||
float frame_border_size = 0.0f;
|
||||
|
||||
|
||||
// Animation and effects
|
||||
bool enable_animations = true;
|
||||
float animation_speed = 1.0f;
|
||||
bool enable_glow_effects = false;
|
||||
|
||||
// Theme-aware sizing system (relative to font size)
|
||||
// compact_factor: 0.8 = very compact, 1.0 = normal, 1.2 = spacious
|
||||
float compact_factor = 1.0f;
|
||||
|
||||
// Semantic sizing multipliers (applied on top of compact_factor)
|
||||
float widget_height_multiplier = 1.0f; // Standard widget height
|
||||
float spacing_multiplier = 1.0f; // Padding/margins between elements
|
||||
float toolbar_height_multiplier = 0.8f; // Compact toolbars
|
||||
float panel_padding_multiplier = 1.0f; // Panel interior padding
|
||||
float input_width_multiplier = 1.0f; // Standard input field width
|
||||
float button_padding_multiplier = 1.0f; // Button interior padding
|
||||
float table_row_height_multiplier = 1.0f; // Table row height
|
||||
float canvas_toolbar_multiplier = 0.75f; // Canvas overlay toolbars
|
||||
|
||||
// Helper methods
|
||||
void ApplyToImGui() const;
|
||||
|
||||
272
src/app/gui/themed_widgets.cc
Normal file
272
src/app/gui/themed_widgets.cc
Normal file
@@ -0,0 +1,272 @@
|
||||
#include "app/gui/themed_widgets.h"
|
||||
|
||||
namespace yaze {
|
||||
namespace gui {
|
||||
namespace themed {
|
||||
|
||||
// ============================================================================
|
||||
// Buttons
|
||||
// ============================================================================
|
||||
|
||||
bool Button(const char* label, const ImVec2& size) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_Button, ConvertColorToImVec4(theme.button));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ConvertColorToImVec4(theme.button_hovered));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ConvertColorToImVec4(theme.button_active));
|
||||
|
||||
bool result = ImGui::Button(label, size);
|
||||
|
||||
ImGui::PopStyleColor(3);
|
||||
return result;
|
||||
}
|
||||
|
||||
bool IconButton(const char* icon, const char* tooltip) {
|
||||
bool result = Button(icon, ImVec2(LayoutHelpers::GetStandardWidgetHeight(),
|
||||
LayoutHelpers::GetStandardWidgetHeight()));
|
||||
if (tooltip && ImGui::IsItemHovered()) {
|
||||
BeginTooltip();
|
||||
ImGui::Text("%s", tooltip);
|
||||
EndTooltip();
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
bool PrimaryButton(const char* label, const ImVec2& size) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_Button, ConvertColorToImVec4(theme.accent));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonHovered,
|
||||
ImVec4(theme.accent.red * 1.2f, theme.accent.green * 1.2f,
|
||||
theme.accent.blue * 1.2f, theme.accent.alpha));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonActive,
|
||||
ImVec4(theme.accent.red * 0.8f, theme.accent.green * 0.8f,
|
||||
theme.accent.blue * 0.8f, theme.accent.alpha));
|
||||
|
||||
bool result = ImGui::Button(label, size);
|
||||
|
||||
ImGui::PopStyleColor(3);
|
||||
return result;
|
||||
}
|
||||
|
||||
bool DangerButton(const char* label, const ImVec2& size) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_Button, ConvertColorToImVec4(theme.error));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonHovered,
|
||||
ImVec4(theme.error.red * 1.2f, theme.error.green * 1.2f,
|
||||
theme.error.blue * 1.2f, theme.error.alpha));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonActive,
|
||||
ImVec4(theme.error.red * 0.8f, theme.error.green * 0.8f,
|
||||
theme.error.blue * 0.8f, theme.error.alpha));
|
||||
|
||||
bool result = ImGui::Button(label, size);
|
||||
|
||||
ImGui::PopStyleColor(3);
|
||||
return result;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Headers & Sections
|
||||
// ============================================================================
|
||||
|
||||
void Header(const char* label) {
|
||||
LayoutHelpers::SectionHeader(label);
|
||||
}
|
||||
|
||||
bool CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_Header, ConvertColorToImVec4(theme.header));
|
||||
ImGui::PushStyleColor(ImGuiCol_HeaderHovered, ConvertColorToImVec4(theme.header_hovered));
|
||||
ImGui::PushStyleColor(ImGuiCol_HeaderActive, ConvertColorToImVec4(theme.header_active));
|
||||
|
||||
bool result = ImGui::CollapsingHeader(label, flags);
|
||||
|
||||
ImGui::PopStyleColor(3);
|
||||
return result;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Cards & Panels
|
||||
// ============================================================================
|
||||
|
||||
void Card(const char* label, std::function<void()> content, const ImVec2& size) {
|
||||
BeginPanel(label, size);
|
||||
content();
|
||||
EndPanel();
|
||||
}
|
||||
|
||||
void BeginPanel(const char* label, const ImVec2& size) {
|
||||
const auto& theme = GetTheme();
|
||||
|
||||
ImGui::PushStyleColor(ImGuiCol_ChildBg, ConvertColorToImVec4(theme.surface));
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_ChildRounding, theme.window_rounding);
|
||||
ImGui::PushStyleVar(ImGuiStyleVar_WindowPadding,
|
||||
ImVec2(LayoutHelpers::GetPanelPadding(),
|
||||
LayoutHelpers::GetPanelPadding()));
|
||||
|
||||
ImGui::BeginChild(label, size, true);
|
||||
}
|
||||
|
||||
void EndPanel() {
|
||||
ImGui::EndChild();
|
||||
ImGui::PopStyleVar(2);
|
||||
ImGui::PopStyleColor(1);
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Inputs
|
||||
// ============================================================================
|
||||
|
||||
bool InputText(const char* label, char* buf, size_t buf_size,
|
||||
ImGuiInputTextFlags flags) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBg, ConvertColorToImVec4(theme.frame_bg));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ConvertColorToImVec4(theme.frame_bg_hovered));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ConvertColorToImVec4(theme.frame_bg_active));
|
||||
|
||||
ImGui::SetNextItemWidth(LayoutHelpers::GetStandardInputWidth());
|
||||
bool result = ImGui::InputText(label, buf, buf_size, flags);
|
||||
|
||||
ImGui::PopStyleColor(3);
|
||||
return result;
|
||||
}
|
||||
|
||||
bool InputInt(const char* label, int* v, int step, int step_fast,
|
||||
ImGuiInputTextFlags flags) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBg, ConvertColorToImVec4(theme.frame_bg));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ConvertColorToImVec4(theme.frame_bg_hovered));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ConvertColorToImVec4(theme.frame_bg_active));
|
||||
|
||||
ImGui::SetNextItemWidth(LayoutHelpers::GetStandardInputWidth());
|
||||
bool result = ImGui::InputInt(label, v, step, step_fast, flags);
|
||||
|
||||
ImGui::PopStyleColor(3);
|
||||
return result;
|
||||
}
|
||||
|
||||
bool InputFloat(const char* label, float* v, float step, float step_fast,
|
||||
const char* format, ImGuiInputTextFlags flags) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBg, ConvertColorToImVec4(theme.frame_bg));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ConvertColorToImVec4(theme.frame_bg_hovered));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ConvertColorToImVec4(theme.frame_bg_active));
|
||||
|
||||
ImGui::SetNextItemWidth(LayoutHelpers::GetStandardInputWidth());
|
||||
bool result = ImGui::InputFloat(label, v, step, step_fast, format, flags);
|
||||
|
||||
ImGui::PopStyleColor(3);
|
||||
return result;
|
||||
}
|
||||
|
||||
bool Checkbox(const char* label, bool* v) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_CheckMark, ConvertColorToImVec4(theme.check_mark));
|
||||
|
||||
bool result = ImGui::Checkbox(label, v);
|
||||
|
||||
ImGui::PopStyleColor(1);
|
||||
return result;
|
||||
}
|
||||
|
||||
bool Combo(const char* label, int* current_item, const char* const items[],
|
||||
int items_count, int popup_max_height_in_items) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBg, ConvertColorToImVec4(theme.frame_bg));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ConvertColorToImVec4(theme.frame_bg_hovered));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ConvertColorToImVec4(theme.frame_bg_active));
|
||||
|
||||
ImGui::SetNextItemWidth(LayoutHelpers::GetStandardInputWidth());
|
||||
bool result = ImGui::Combo(label, current_item, items, items_count,
|
||||
popup_max_height_in_items);
|
||||
|
||||
ImGui::PopStyleColor(3);
|
||||
return result;
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Tables
|
||||
// ============================================================================
|
||||
|
||||
bool BeginTable(const char* str_id, int columns, ImGuiTableFlags flags,
|
||||
const ImVec2& outer_size, float inner_width) {
|
||||
return LayoutHelpers::BeginTableWithTheming(str_id, columns, flags, outer_size, inner_width);
|
||||
}
|
||||
|
||||
void EndTable() {
|
||||
LayoutHelpers::EndTable();
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Tooltips & Help
|
||||
// ============================================================================
|
||||
|
||||
void HelpMarker(const char* desc) {
|
||||
LayoutHelpers::HelpMarker(desc);
|
||||
}
|
||||
|
||||
void BeginTooltip() {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_PopupBg, ConvertColorToImVec4(theme.popup_bg));
|
||||
ImGui::BeginTooltip();
|
||||
}
|
||||
|
||||
void EndTooltip() {
|
||||
ImGui::EndTooltip();
|
||||
ImGui::PopStyleColor(1);
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Status & Feedback
|
||||
// ============================================================================
|
||||
|
||||
void StatusText(const char* text, StatusType type) {
|
||||
const auto& theme = GetTheme();
|
||||
ImVec4 color;
|
||||
|
||||
switch (type) {
|
||||
case StatusType::kSuccess:
|
||||
color = ConvertColorToImVec4(theme.success);
|
||||
break;
|
||||
case StatusType::kWarning:
|
||||
color = ConvertColorToImVec4(theme.warning);
|
||||
break;
|
||||
case StatusType::kError:
|
||||
color = ConvertColorToImVec4(theme.error);
|
||||
break;
|
||||
case StatusType::kInfo:
|
||||
color = ConvertColorToImVec4(theme.info);
|
||||
break;
|
||||
}
|
||||
|
||||
ImGui::TextColored(color, "%s", text);
|
||||
}
|
||||
|
||||
void ProgressBar(float fraction, const ImVec2& size, const char* overlay) {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_PlotHistogram, ConvertColorToImVec4(theme.accent));
|
||||
|
||||
ImGui::ProgressBar(fraction, size, overlay);
|
||||
|
||||
ImGui::PopStyleColor(1);
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
// Utility
|
||||
// ============================================================================
|
||||
|
||||
void PushWidgetColors() {
|
||||
const auto& theme = GetTheme();
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBg, ConvertColorToImVec4(theme.frame_bg));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ConvertColorToImVec4(theme.frame_bg_hovered));
|
||||
ImGui::PushStyleColor(ImGuiCol_FrameBgActive, ConvertColorToImVec4(theme.frame_bg_active));
|
||||
ImGui::PushStyleColor(ImGuiCol_Button, ConvertColorToImVec4(theme.button));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ConvertColorToImVec4(theme.button_hovered));
|
||||
ImGui::PushStyleColor(ImGuiCol_ButtonActive, ConvertColorToImVec4(theme.button_active));
|
||||
}
|
||||
|
||||
void PopWidgetColors() {
|
||||
ImGui::PopStyleColor(6);
|
||||
}
|
||||
|
||||
} // namespace themed
|
||||
} // namespace gui
|
||||
} // namespace yaze
|
||||
211
src/app/gui/themed_widgets.h
Normal file
211
src/app/gui/themed_widgets.h
Normal file
@@ -0,0 +1,211 @@
|
||||
#ifndef YAZE_APP_GUI_THEMED_WIDGETS_H
|
||||
#define YAZE_APP_GUI_THEMED_WIDGETS_H
|
||||
|
||||
#include "imgui/imgui.h"
|
||||
#include "app/gui/theme_manager.h"
|
||||
#include "app/gui/layout_helpers.h"
|
||||
#include "app/gui/color.h"
|
||||
|
||||
namespace yaze {
|
||||
namespace gui {
|
||||
|
||||
/**
|
||||
* @brief Opt-in themed widget library for gradual migration
|
||||
*
|
||||
* All widgets automatically use the current theme from ThemeManager.
|
||||
* Editors can opt-in by using these widgets instead of raw ImGui calls.
|
||||
*
|
||||
* Usage:
|
||||
* ```cpp
|
||||
* using namespace yaze::gui::themed;
|
||||
*
|
||||
* if (Button("Save")) {
|
||||
* // Button uses theme colors automatically
|
||||
* }
|
||||
*
|
||||
* Header("Settings"); // Themed section header
|
||||
*
|
||||
* Card("Properties", [&]() {
|
||||
* // Content inside themed card
|
||||
* });
|
||||
* ```
|
||||
*/
|
||||
namespace themed {
|
||||
|
||||
// ============================================================================
|
||||
// Buttons
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* @brief Themed button with automatic color application
|
||||
*/
|
||||
bool Button(const char* label, const ImVec2& size = ImVec2(0, 0));
|
||||
|
||||
/**
|
||||
* @brief Themed button with icon (Material Design Icons)
|
||||
*/
|
||||
bool IconButton(const char* icon, const char* tooltip = nullptr);
|
||||
|
||||
/**
|
||||
* @brief Primary action button (uses accent color)
|
||||
*/
|
||||
bool PrimaryButton(const char* label, const ImVec2& size = ImVec2(0, 0));
|
||||
|
||||
/**
|
||||
* @brief Danger/destructive action button (uses error color)
|
||||
*/
|
||||
bool DangerButton(const char* label, const ImVec2& size = ImVec2(0, 0));
|
||||
|
||||
// ============================================================================
|
||||
// Headers & Sections
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* @brief Themed section header with accent color
|
||||
*/
|
||||
void Header(const char* label);
|
||||
|
||||
/**
|
||||
* @brief Collapsible section with themed header
|
||||
*/
|
||||
bool CollapsingHeader(const char* label, ImGuiTreeNodeFlags flags = 0);
|
||||
|
||||
// ============================================================================
|
||||
// Cards & Panels
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* @brief Themed card with rounded corners and shadow
|
||||
* @param label Unique ID for the card
|
||||
* @param content Callback function to render card content
|
||||
* @param size Card size (0, 0 for auto-size)
|
||||
*/
|
||||
void Card(const char* label, std::function<void()> content,
|
||||
const ImVec2& size = ImVec2(0, 0));
|
||||
|
||||
/**
|
||||
* @brief Begin themed panel (manual version of Card)
|
||||
*/
|
||||
void BeginPanel(const char* label, const ImVec2& size = ImVec2(0, 0));
|
||||
|
||||
/**
|
||||
* @brief End themed panel
|
||||
*/
|
||||
void EndPanel();
|
||||
|
||||
// ============================================================================
|
||||
// Inputs
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* @brief Themed text input
|
||||
*/
|
||||
bool InputText(const char* label, char* buf, size_t buf_size,
|
||||
ImGuiInputTextFlags flags = 0);
|
||||
|
||||
/**
|
||||
* @brief Themed integer input
|
||||
*/
|
||||
bool InputInt(const char* label, int* v, int step = 1, int step_fast = 100,
|
||||
ImGuiInputTextFlags flags = 0);
|
||||
|
||||
/**
|
||||
* @brief Themed float input
|
||||
*/
|
||||
bool InputFloat(const char* label, float* v, float step = 0.0f,
|
||||
float step_fast = 0.0f, const char* format = "%.3f",
|
||||
ImGuiInputTextFlags flags = 0);
|
||||
|
||||
/**
|
||||
* @brief Themed checkbox
|
||||
*/
|
||||
bool Checkbox(const char* label, bool* v);
|
||||
|
||||
/**
|
||||
* @brief Themed combo box
|
||||
*/
|
||||
bool Combo(const char* label, int* current_item, const char* const items[],
|
||||
int items_count, int popup_max_height_in_items = -1);
|
||||
|
||||
// ============================================================================
|
||||
// Tables
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* @brief Begin themed table with automatic styling
|
||||
*/
|
||||
bool BeginTable(const char* str_id, int columns, ImGuiTableFlags flags = 0,
|
||||
const ImVec2& outer_size = ImVec2(0, 0), float inner_width = 0.0f);
|
||||
|
||||
/**
|
||||
* @brief End themed table
|
||||
*/
|
||||
void EndTable();
|
||||
|
||||
// ============================================================================
|
||||
// Tooltips & Help
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* @brief Themed help marker with tooltip
|
||||
*/
|
||||
void HelpMarker(const char* desc);
|
||||
|
||||
/**
|
||||
* @brief Begin themed tooltip
|
||||
*/
|
||||
void BeginTooltip();
|
||||
|
||||
/**
|
||||
* @brief End themed tooltip
|
||||
*/
|
||||
void EndTooltip();
|
||||
|
||||
// ============================================================================
|
||||
// Status & Feedback
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* @brief Themed status text (success, warning, error, info)
|
||||
*/
|
||||
void StatusText(const char* text, StatusType type);
|
||||
|
||||
enum class StatusType {
|
||||
kSuccess,
|
||||
kWarning,
|
||||
kError,
|
||||
kInfo
|
||||
};
|
||||
|
||||
/**
|
||||
* @brief Themed progress bar
|
||||
*/
|
||||
void ProgressBar(float fraction, const ImVec2& size = ImVec2(-1, 0),
|
||||
const char* overlay = nullptr);
|
||||
|
||||
// ============================================================================
|
||||
// Utility
|
||||
// ============================================================================
|
||||
|
||||
/**
|
||||
* @brief Get current theme (shortcut)
|
||||
*/
|
||||
inline const EnhancedTheme& GetTheme() {
|
||||
return ThemeManager::Get().GetCurrentTheme();
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Apply theme colors to next widget
|
||||
*/
|
||||
void PushWidgetColors();
|
||||
|
||||
/**
|
||||
* @brief Restore previous colors
|
||||
*/
|
||||
void PopWidgetColors();
|
||||
|
||||
} // namespace themed
|
||||
} // namespace gui
|
||||
} // namespace yaze
|
||||
|
||||
#endif // YAZE_APP_GUI_THEMED_WIDGETS_H
|
||||
@@ -1,72 +0,0 @@
|
||||
#include "hyrule_magic.h"
|
||||
|
||||
namespace yaze {
|
||||
namespace zelda3 {
|
||||
|
||||
namespace {
|
||||
|
||||
// "load little endian value at the given byte offset and shift to get its
|
||||
// value relative to the base offset (powers of 256, essentially)"
|
||||
unsigned ldle(uint8_t const *const p_arr, unsigned const p_index) {
|
||||
uint32_t v = p_arr[p_index];
|
||||
v <<= (8 * p_index);
|
||||
return v;
|
||||
}
|
||||
|
||||
void stle(uint8_t *const p_arr, size_t const p_index, unsigned const p_val) {
|
||||
uint8_t v = (p_val >> (8 * p_index)) & 0xff;
|
||||
p_arr[p_index] = v;
|
||||
}
|
||||
|
||||
void stle0(uint8_t *const p_arr, unsigned const p_val) {
|
||||
stle(p_arr, 0, p_val);
|
||||
}
|
||||
|
||||
void stle1(uint8_t *const p_arr, unsigned const p_val) {
|
||||
stle(p_arr, 1, p_val);
|
||||
}
|
||||
|
||||
void stle2(uint8_t *const p_arr, unsigned const p_val) {
|
||||
stle(p_arr, 2, p_val);
|
||||
}
|
||||
|
||||
void stle3(uint8_t *const p_arr, unsigned const p_val) {
|
||||
stle(p_arr, 3, p_val);
|
||||
}
|
||||
|
||||
// Helper function to get the first byte in a little endian number
|
||||
uint32_t ldle0(uint8_t const *const p_arr) { return ldle(p_arr, 0); }
|
||||
|
||||
// Helper function to get the second byte in a little endian number
|
||||
uint32_t ldle1(uint8_t const *const p_arr) { return ldle(p_arr, 1); }
|
||||
|
||||
// Helper function to get the third byte in a little endian number
|
||||
uint32_t ldle2(uint8_t const *const p_arr) { return ldle(p_arr, 2); }
|
||||
|
||||
// Helper function to get the third byte in a little endian number
|
||||
uint32_t ldle3(uint8_t const *const p_arr) { return ldle(p_arr, 3); }
|
||||
|
||||
} // namespace
|
||||
|
||||
void stle16b_i(uint8_t *const p_arr, size_t const p_index,
|
||||
uint16_t const p_val) {
|
||||
stle16b(p_arr + (p_index * 2), p_val);
|
||||
}
|
||||
|
||||
void stle16b(uint8_t *const p_arr, uint16_t const p_val) {
|
||||
stle0(p_arr, p_val);
|
||||
stle1(p_arr, p_val);
|
||||
}
|
||||
|
||||
uint16_t ldle16b(uint8_t const *const p_arr) {
|
||||
uint16_t v = 0;
|
||||
v |= (ldle0(p_arr) | ldle1(p_arr));
|
||||
return v;
|
||||
}
|
||||
|
||||
uint16_t ldle16b_i(uint8_t const *const p_arr, size_t const p_index) {
|
||||
return ldle16b(p_arr + (2 * p_index));
|
||||
}
|
||||
|
||||
} // namespace zelda3
|
||||
} // namespace yaze
|
||||
@@ -1,31 +0,0 @@
|
||||
#ifndef YAZE_APP_ZELDA3_HYRULE_MAGIC_H
|
||||
#define YAZE_APP_ZELDA3_HYRULE_MAGIC_H
|
||||
|
||||
#include <cstdint>
|
||||
#include <cstring>
|
||||
|
||||
namespace yaze {
|
||||
namespace zelda3 {
|
||||
/**
|
||||
* @brief Store little endian 16-bit value using a byte pointer, offset by an
|
||||
* index before dereferencing
|
||||
*/
|
||||
void stle16b_i(uint8_t *const p_arr, size_t const p_index,
|
||||
uint16_t const p_val);
|
||||
|
||||
void stle16b(uint8_t *const p_arr, uint16_t const p_val);
|
||||
|
||||
/**
|
||||
* @brief Load little endian halfword (16-bit) dereferenced from an arrays of
|
||||
* bytes. This version provides an index that will be multiplied by 2 and added
|
||||
* to the base address.
|
||||
*/
|
||||
uint16_t ldle16b_i(uint8_t const *const p_arr, size_t const p_index);
|
||||
|
||||
// Load little endian halfword (16-bit) dereferenced from
|
||||
uint16_t ldle16b(uint8_t const *const p_arr);
|
||||
|
||||
} // namespace zelda3
|
||||
} // namespace yaze
|
||||
|
||||
#endif // YAZE_APP_ZELDA3_HYRULE_MAGIC_H
|
||||
@@ -7,7 +7,6 @@ set(
|
||||
app/zelda3/dungeon/room.cc
|
||||
app/zelda3/dungeon/room_layout.cc
|
||||
app/zelda3/dungeon/room_object.cc
|
||||
app/zelda3/hyrule_magic.cc
|
||||
app/zelda3/music/tracker.cc
|
||||
app/zelda3/overworld/overworld.cc
|
||||
app/zelda3/overworld/overworld_map.cc
|
||||
|
||||
Reference in New Issue
Block a user