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

Set scale-aware text size when initializing the object

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-03-06 19:58:43 -06:00
committed by Celtic Minstrel
parent 5696b97491
commit 823fb8904d
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/boe.text.cpp
View File

@@ -24,6 +24,7 @@ const int TEXT_BUF_LEN = 70;
#include "fileio/resmgr/res_font.hpp" #include "fileio/resmgr/res_font.hpp"
#include "spell.hpp" #include "spell.hpp"
#include "tools/enum_map.hpp" #include "tools/enum_map.hpp"
#include "tools/winutil.hpp"
#include "replay.hpp" #include "replay.hpp"
#include <boost/lexical_cast.hpp> #include <boost/lexical_cast.hpp>
@@ -1089,7 +1090,7 @@ void print_buf () {
location moveTo; location moveTo;
while((line_to_print!= buf_pointer) && (num_lines_printed < LINES_IN_TEXT_WIN)) { while((line_to_print!= buf_pointer) && (num_lines_printed < LINES_IN_TEXT_WIN)) {
moveTo = location(4, 1 + 12 * num_lines_printed); moveTo = location(4, 1 + 12 * num_lines_printed);
sf::Text text(text_buffer[line_to_print].line, *ResMgr::fonts.get("plain"), 12); sf::Text text(text_buffer[line_to_print].line, *ResMgr::fonts.get("plain"), 12 * get_ui_scale());
text.setColor(Colours::BLACK); text.setColor(Colours::BLACK);
text.setPosition(moveTo); text.setPosition(moveTo);
draw_scale_aware_text(text_area_gworld(), text); draw_scale_aware_text(text_area_gworld(), text);

8
src/gfx/render_text.cpp
View File

@@ -14,7 +14,7 @@
#include <utility> #include <utility>
#include "winutil.hpp" #include "winutil.hpp"
void TextStyle::applyTo(sf::Text& text) { void TextStyle::applyTo(sf::Text& text, double scale) {
switch(font) { switch(font) {
case FONT_PLAIN: case FONT_PLAIN:
text.setFont(*ResMgr::fonts.get("plain")); text.setFont(*ResMgr::fonts.get("plain"));
@@ -29,7 +29,7 @@ void TextStyle::applyTo(sf::Text& text) {
text.setFont(*ResMgr::fonts.get("maidenword")); text.setFont(*ResMgr::fonts.get("maidenword"));
break; break;
} }
text.setCharacterSize(pointSize); text.setCharacterSize(pointSize * scale);
int style = sf::Text::Regular; int style = sf::Text::Regular;
if(italic) style |= sf::Text::Italic; if(italic) style |= sf::Text::Italic;
if(underline) style |= sf::Text::Underlined; if(underline) style |= sf::Text::Underlined;
@@ -153,8 +153,6 @@ sf::Vector2f scaled_view_top_left(sf::RenderTarget& dest_window, sf::View& scale
} }
void draw_scale_aware_text(sf::RenderTarget& dest_window, sf::Text str_to_draw) { void draw_scale_aware_text(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){ if(dynamic_cast<sf::RenderWindow*>(&dest_window) != nullptr){
// Temporarily switch window to its unscaled view to draw scale-aware text // Temporarily switch window to its unscaled view to draw scale-aware text
sf::View scaled_view = dest_window.getView(); sf::View scaled_view = dest_window.getView();
@@ -198,6 +196,8 @@ static void win_draw_string(sf::RenderTarget& dest_window,rectangle dest_rect,st
str_to_draw.setString(str); str_to_draw.setString(str);
short total_width = str_to_draw.getLocalBounds().width; short total_width = str_to_draw.getLocalBounds().width;
options.style.applyTo(str_to_draw, get_ui_scale());
eTextMode mode = options.mode; eTextMode mode = options.mode;
if(mode == eTextMode::WRAP && total_width < dest_rect.width() && !options.right_align) if(mode == eTextMode::WRAP && total_width < dest_rect.width() && !options.right_align)
mode = eTextMode::LEFT_TOP; mode = eTextMode::LEFT_TOP;

2
src/gfx/render_text.hpp
View File

@@ -36,7 +36,7 @@ struct TextStyle {
int pointSize = 10, lineHeight = 10; int pointSize = 10, lineHeight = 10;
sf::Color colour; sf::Color colour;
TextStyle() : colour(sf::Color::Black) {} TextStyle() : colour(sf::Color::Black) {}
void applyTo(sf::Text& text); void applyTo(sf::Text& text, double scale = 1.0);
}; };
// elements: std::make_tuple(last_line_break, last_word_break, line_width) // elements: std::make_tuple(last_line_break, last_word_break, line_width)