Mirrorlandia_minetest/minetest
1
0
Fork 1
mirror of https://github.com/minetest/minetest.git synced 2025-02-18 19:03:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Consistent width for internal scrollbars of formspec elements (#14689)

Browse Source 
also: Make sure that very short, wide scrollbars are still usable
This commit is contained in:
grorp
2024-05-24 12:10:19 +02:00
committed by GitHub
parent 6c0b8229ec
commit d5fc040d2d
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/clientlauncher.cpp
View File

@ -343,7 +343,7 @@ void ClientLauncher::init_guienv(gui::IGUIEnvironment *guienv)
float density = rangelim(g_settings->getFloat("gui_scaling"), 0.5f, 20) * float density = rangelim(g_settings->getFloat("gui_scaling"), 0.5f, 20) *
RenderingEngine::getDisplayDensity(); RenderingEngine::getDisplayDensity();
skin->setSize(gui::EGDS_CHECK_BOX_WIDTH, (s32)(17.0f * density)); skin->setSize(gui::EGDS_CHECK_BOX_WIDTH, (s32)(17.0f * density));
skin->setSize(gui::EGDS_SCROLLBAR_SIZE, (s32)(14.0f * density)); skin->setSize(gui::EGDS_SCROLLBAR_SIZE, (s32)(21.0f * density));
skin->setSize(gui::EGDS_WINDOW_BUTTON_WIDTH, (s32)(15.0f * density)); skin->setSize(gui::EGDS_WINDOW_BUTTON_WIDTH, (s32)(15.0f * density));
if (density > 1.5f) { if (density > 1.5f) {
std::string sprite_path = porting::path_share + "/textures/base/pack/"; std::string sprite_path = porting::path_share + "/textures/base/pack/";

4
src/gui/guiScrollBar.cpp
View File

@ -274,10 +274,10 @@ void GUIScrollBar::setPosRaw(const s32 &pos)
s32 thumb_min = 0; s32 thumb_min = 0;
if (is_horizontal) { if (is_horizontal) {
thumb_min = RelativeRect.getHeight(); thumb_min = std::min(RelativeRect.getHeight(), RelativeRect.getWidth() / 2);
thumb_area = RelativeRect.getWidth() - border_size * 2; thumb_area = RelativeRect.getWidth() - border_size * 2;
} else { } else {
thumb_min = RelativeRect.getWidth(); thumb_min = std::min(RelativeRect.getWidth(), RelativeRect.getHeight() / 2);
thumb_area = RelativeRect.getHeight() - border_size * 2; thumb_area = RelativeRect.getHeight() - border_size * 2;
} }

2
src/gui/guiTable.cpp
View File

@ -60,7 +60,7 @@ GUITable::GUITable(gui::IGUIEnvironment *env,
m_rowheight = MYMAX(m_rowheight, 1); m_rowheight = MYMAX(m_rowheight, 1);
} }
const s32 s = skin->getSize(gui::EGDS_SCROLLBAR_SIZE) * 1.5f; const s32 s = skin->getSize(gui::EGDS_SCROLLBAR_SIZE);
m_scrollbar = new GUIScrollBar(Environment, this, -1, m_scrollbar = new GUIScrollBar(Environment, this, -1,
core::rect<s32>(RelativeRect.getWidth() - s, core::rect<s32>(RelativeRect.getWidth() - s,
0, 0,