openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Draw scale-aware text onto windows

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-02-04 19:58:49 -06:00
parent 8ab451f633
commit 6fa63307b1
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/gfx/render_text.cpp
View File

@@ -12,6 +12,7 @@
#include "fileio/resmgr/res_font.hpp"
#include "gfx/render_shapes.hpp"
#include <utility>
#include "winutil.hpp"
void TextStyle::applyTo(sf::Text& text) {
switch(font) {
@@ -134,6 +135,21 @@ break_info_t calculate_line_wrapping(rectangle dest_rect, std::string str, TextS
return break_info;
}
void draw_scale_aware(sf::RenderTarget& dest_window, sf::Text str_to_draw) {
str_to_draw.setCharacterSize(str_to_draw.getCharacterSize() * get_ui_scale());
if(dynamic_cast<sf::RenderWindow*>(&dest_window) != nullptr){
str_to_draw.setPosition(str_to_draw.getPosition() * (float)get_ui_scale());
// Temporarily switch window to its unscaled view to draw scale-aware text
sf::View view = dest_window.getView();
dest_window.setView(dest_window.getDefaultView());
dest_window.draw(str_to_draw);
dest_window.setView(view);
}else if(dynamic_cast<sf::RenderTexture*>(&dest_window) != nullptr){
// TODO Onto a RenderTexture is trickier because the texture is locked at the smaller size.
}
}
static void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,text_params_t& options) {
if(str.empty()) return; // Nothing to do!
short line_height = options.style.lineHeight;
@@ -227,11 +243,7 @@ static void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,st
bounds.inset(0,-4);
fill_rect(dest_window, bounds, options.hilite_bg);
} else str_to_draw.setColor(options.style.colour);
dest_window.draw(str_to_draw);
if(options.style.font == FONT_BOLD) {
str_to_draw.move(1, 0);
dest_window.draw(str_to_draw);
}
draw_scale_aware(dest_window, str_to_draw);
}
}

1
src/gfx/render_text.hpp
View File

@@ -57,6 +57,7 @@ enum class eTextMode {
std::vector<rectangle> draw_string_hilite(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,TextStyle style,std::vector<hilite_t> hilites,sf::Color hiliteClr);
std::vector<snippet_t> draw_string_sel(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,TextStyle style,std::vector<hilite_t> hilites,sf::Color hiliteClr);
void draw_scale_aware(sf::RenderTarget& dest_window,sf::Text text);
void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,eTextMode mode,TextStyle style,bool right_align = false);
void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,std::string str,eTextMode mode,TextStyle style, break_info_t break_info,bool right_align = false);
break_info_t calculate_line_wrapping(rectangle dest_rect, std::string str, TextStyle style);