izzy/Ghostship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Ghostship.git synced 2026-06-19 01:17:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13 from garrettjoecox/more-c-str-fixes

Browse Source 
Fix some more invalid c_str usage
This commit is contained in:
Lywx
2023-10-12 08:42:09 -06:00
committed by GitHub
parent d2e055cdda 4ca4e0744c
commit 03d77186c1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/port/ui/UIWidgets.cpp
+6 -5
View File
@@ -10,7 +10,6 @@
#define IMGUI_DEFINE_MATH_OPERATORS
#include <ImGui/imgui_internal.h>
#include <libultraship/libultraship.h>
#include "Utils/StringHelper.h"
#include <libultraship/libultra/types.h>
namespace UIWidgets {
@@ -709,8 +708,8 @@ namespace UIWidgets {
ImGui::PushID(label);
bool dirty = false;
float startX = ImGui::GetCursorPosX();
auto format = StringHelper::Sprintf("##%s", label);
const char* invisibleLabel = format.c_str();
std::string invisibleLabelStr = "##" + std::string(label);
const char* invisibleLabel = invisibleLabelStr.c_str();
ImGui::BeginDisabled(options.disabled);
PushStyleCheckbox(options.color);
if (options.alignment == ComponentAlignment::Right) {
@@ -792,7 +791,8 @@ namespace UIWidgets {
bool Combobox(const char* label, uint8_t* value, std::span<const char*, std::dynamic_extent> comboArray, const ComboboxOptions& options) {
bool dirty = false;
float startX = ImGui::GetCursorPosX();
const char* invisibleLabel = ("##" + std::string(label)).c_str();
std::string invisibleLabelStr = "##" + std::string(label);
const char* invisibleLabel = invisibleLabelStr.c_str();
ImGui::PushID(label);
ImGui::BeginGroup();
ImGui::BeginDisabled(options.disabled);
@@ -891,7 +891,8 @@ namespace UIWidgets {
bool CVarSliderInt(const char* label, const char* cvarName, int32_t min, int32_t max, const int32_t defaultValue, const SliderOptions& options){
bool dirty = false;
const char* invisibleLabel = ("##" + std::string(label)).c_str();
std::string invisibleLabelStr = "##" + std::string(label);
const char* invisibleLabel = invisibleLabelStr.c_str();
int32_t value = CVarGetInteger(cvarName, defaultValue);
ImGui::PushID(label);
ImGui::BeginGroup();