mirror of https://github.com/bkaradzic/bgfx
Updated ImGui.
This commit is contained in:
parent
f9934d5253
commit
4a53246a40
|
@ -362,7 +362,7 @@ void ImGui::ShowTestWindow(bool* p_open)
|
|||
ImVec2 pos = ImGui::GetCursorScreenPos();
|
||||
ImGui::GetWindowDrawList()->AddRectFilled(ImVec2(pos.x + wrap_width, pos.y), ImVec2(pos.x + wrap_width + 10, pos.y + ImGui::GetTextLineHeight()), IM_COL32(255,0,255,255));
|
||||
ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + wrap_width);
|
||||
ImGui::Text("lazy dog. This paragraph is made to fit within %.0f pixels. The quick brown fox jumps over the lazy dog.", wrap_width);
|
||||
ImGui::Text("The lazy dog is a good dog. This paragraph is made to fit within %.0f pixels. Testing a 1 character word. The quick brown fox jumps over the lazy dog.", wrap_width);
|
||||
ImGui::GetWindowDrawList()->AddRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax(), IM_COL32(255,255,0,255));
|
||||
ImGui::PopTextWrapPos();
|
||||
|
||||
|
@ -370,7 +370,7 @@ void ImGui::ShowTestWindow(bool* p_open)
|
|||
pos = ImGui::GetCursorScreenPos();
|
||||
ImGui::GetWindowDrawList()->AddRectFilled(ImVec2(pos.x + wrap_width, pos.y), ImVec2(pos.x + wrap_width + 10, pos.y + ImGui::GetTextLineHeight()), IM_COL32(255,0,255,255));
|
||||
ImGui::PushTextWrapPos(ImGui::GetCursorPos().x + wrap_width);
|
||||
ImGui::Text("aaaaaaaa bbbbbbbb, cccccccc,dddddddd. eeeeeeee ffffffff. gggggggg!hhhhhhhh");
|
||||
ImGui::Text("aaaaaaaa bbbbbbbb, c cccccccc,dddddddd. d eeeeeeee ffffffff. gggggggg!hhhhhhhh");
|
||||
ImGui::GetWindowDrawList()->AddRect(ImGui::GetItemRectMin(), ImGui::GetItemRectMax(), IM_COL32(255,255,0,255));
|
||||
ImGui::PopTextWrapPos();
|
||||
|
||||
|
|
|
@ -1853,6 +1853,7 @@ const char* ImFont::CalcWordWrapPositionA(float scale, const char* text, const c
|
|||
{
|
||||
line_width += blank_width;
|
||||
blank_width = 0.0f;
|
||||
word_end = s;
|
||||
}
|
||||
blank_width += char_width;
|
||||
inside_word = false;
|
||||
|
|
|
@ -440,11 +440,15 @@ extern int LoadEXRFromMemory(float *out_rgba, const unsigned char *memory,
|
|||
#include "zfp.h"
|
||||
#endif
|
||||
|
||||
#if __cplusplus > 199711L
|
||||
// C++11
|
||||
#include <cstdint>
|
||||
#endif // __cplusplus > 199711L
|
||||
|
||||
namespace tinyexr {
|
||||
|
||||
#if __cplusplus > 199711L
|
||||
// C++11
|
||||
#include <cstdint>
|
||||
typedef uint64_t tinyexr_uint64;
|
||||
typedef int64_t tinyexr_int64;
|
||||
#else
|
||||
|
|
Loading…
Reference in New Issue