blakeridgway/supercell-wx
1
0
Fork 0
mirror of https://github.com/ciphervance/supercell-wx.git synced 2025-10-30 06:50:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Wrap hover text, default to 80 characters

Browse source
This commit is contained in:
Dan Paulat 2023-08-30 22:43:44 -05:00
parent 24c919afb6
commit 23732cef48
7 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -34,3 +34,6 @@
[submodule "external/units"] [submodule "external/units"]
path = external/units path = external/units
url = https://github.com/nholthaus/units.git url = https://github.com/nholthaus/units.git
[submodule "external/textflowcpp"]
path = external/textflowcpp
url = https://github.com/catchorg/textflowcpp.git

2
ACKNOWLEDGEMENTS.md
View file

@ -36,6 +36,8 @@ Supercell Wx uses code from the following dependencies:
| [spdlog](https://github.com/gabime/spdlog) | [MIT License](https://spdx.org/licenses/MIT.html) | | [spdlog](https://github.com/gabime/spdlog) | [MIT License](https://spdx.org/licenses/MIT.html) |
| [SQLite](https://www.sqlite.org/) | Public Domain | | [SQLite](https://www.sqlite.org/) | Public Domain |
| [stb](https://github.com/nothings/stb) | Public Domain | | [stb](https://github.com/nothings/stb) | Public Domain |
| [TextFlowCpp](https://github.com/catchorg/textflowcpp) | [Boost Software License 1.0](https://spdx.org/licenses/BSL-1.0.html) |
| [Units](https://github.com/nholthaus/units) | [MIT License](https://spdx.org/licenses/MIT.html) |
| [Vulkan SDK](https://www.vulkan.org/) | [Apache License 2.0](https://spdx.org/licenses/Apache-2.0.html) | | [Vulkan SDK](https://www.vulkan.org/) | [Apache License 2.0](https://spdx.org/licenses/Apache-2.0.html) |
| [zlib](https://zlib.net/) | [zlib License](https://spdx.org/licenses/Zlib.html) | | [zlib](https://zlib.net/) | [zlib License](https://spdx.org/licenses/Zlib.html) |

2
external/CMakeLists.txt vendored
View file

@ -11,6 +11,7 @@ set_property(DIRECTORY
imgui.cmake imgui.cmake
mapbox-gl-native.cmake mapbox-gl-native.cmake
stb.cmake stb.cmake
textflowcpp.cmake
units.cmake) units.cmake)
include(aws-sdk-cpp.cmake) include(aws-sdk-cpp.cmake)
@ -20,4 +21,5 @@ include(hsluv-c.cmake)
include(imgui.cmake) include(imgui.cmake)
include(mapbox-gl-native.cmake) include(mapbox-gl-native.cmake)
include(stb.cmake) include(stb.cmake)
include(textflowcpp.cmake)
include(units.cmake) include(units.cmake)

1
external/textflowcpp vendored Submodule

@ -0,0 +1 @@
Subproject commit 12010ddc8d15538ceea20622d22977e7c5a25da5

4
external/textflowcpp.cmake vendored Normal file
View file

@ -0,0 +1,4 @@
cmake_minimum_required(VERSION 3.20)
set(PROJECT_NAME scwx-textflowcpp)
set(TEXTFLOWCPP_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/textflowcpp PARENT_SCOPE)

3
scwx-qt/scwx-qt.cmake
View file

@ -418,7 +418,8 @@ target_include_directories(scwx-qt PUBLIC ${scwx-qt_SOURCE_DIR}/source
${FTGL_INCLUDE_DIR} ${FTGL_INCLUDE_DIR}
${IMGUI_INCLUDE_DIRS} ${IMGUI_INCLUDE_DIRS}
${MBGL_INCLUDE_DIR} ${MBGL_INCLUDE_DIR}
${STB_INCLUDE_DIR}) ${STB_INCLUDE_DIR}
${TEXTFLOWCPP_INCLUDE_DIR})
target_include_directories(supercell-wx PUBLIC ${scwx-qt_SOURCE_DIR}/source) target_include_directories(supercell-wx PUBLIC ${scwx-qt_SOURCE_DIR}/source)

8
scwx-qt/source/scwx/qt/util/imgui.cpp
View file

@ -5,6 +5,7 @@
#include <mutex> #include <mutex>
#include <TextFlow.hpp>
#include <imgui.h> #include <imgui.h>
namespace scwx namespace scwx
@ -85,11 +86,16 @@ void ImGui::Impl::UpdateMonospaceFont()
void ImGui::DrawTooltip(const std::string& hoverText) void ImGui::DrawTooltip(const std::string& hoverText)
{ {
static constexpr std::size_t kDefaultWidth = 80u;
p->Initialize(); p->Initialize();
auto wrappedText =
TextFlow::Column(hoverText).width(kDefaultWidth).toString();
::ImGui::BeginTooltip(); ::ImGui::BeginTooltip();
::ImGui::PushFont(p->monospaceFont_); ::ImGui::PushFont(p->monospaceFont_);
::ImGui::TextUnformatted(hoverText.c_str()); ::ImGui::TextUnformatted(wrappedText.c_str());
::ImGui::PopFont(); ::ImGui::PopFont();
::ImGui::EndTooltip(); ::ImGui::EndTooltip();
} }