minenux/minetest-engine-multicraft2
1
0
Fork 0
Code Releases Activity

Scale images in the table on the desktop

Browse Source
This commit is contained in:
MoNTE48 2022-01-23 12:51:22 +01:00
parent f8fb722740
commit 73392bc567
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gui/guiTable.cpp
View File

@ -80,9 +80,6 @@ GUITable::GUITable(gui::IGUIEnvironment *env,
float density = RenderingEngine::getDisplayDensity(); float density = RenderingEngine::getDisplayDensity();
float gui_scaling = g_settings->getFloat("gui_scaling"); float gui_scaling = g_settings->getFloat("gui_scaling");
scale = density * gui_scaling; scale = density * gui_scaling;
#if defined(__ANDROID__) || defined(__IOS__)
density = 1; // dp scaling is applied by the skin
#endif
core::rect<s32> relative_rect = m_scrollbar->getRelativePosition(); core::rect<s32> relative_rect = m_scrollbar->getRelativePosition();
s32 width = (relative_rect.getWidth() / (2.0 / 3.0)) * density * s32 width = (relative_rect.getWidth() / (2.0 / 3.0)) * density *
gui_scaling; gui_scaling;
@ -388,11 +385,7 @@ void GUITable::setTable(const TableOptions &options,
image = m_images[row->content_index]; image = m_images[row->content_index];
// Get content width and update xmax // Get content width and update xmax
#if defined(__ANDROID__) || defined(__IOS__)
row->content_width = image ? image->getOriginalSize().Width * scale : 0; row->content_width = image ? image->getOriginalSize().Width * scale : 0;
#else
row->content_width = image ? image->getOriginalSize().Width : 0;
#endif
row->content_width = MYMAX(row->content_width, width); row->content_width = MYMAX(row->content_width, width);
s32 row_xmax = row->x + padding + row->content_width; s32 row_xmax = row->x + padding + row->content_width;
xmax = MYMAX(xmax, row_xmax); xmax = MYMAX(xmax, row_xmax);
@ -764,11 +757,7 @@ void GUITable::drawCell(const Cell *cell, video::SColor color,
core::rect<s32> source_rect( core::rect<s32> source_rect(
core::position2d<s32>(0, 0), core::position2d<s32>(0, 0),
image->getOriginalSize()); image->getOriginalSize());
#if defined(__ANDROID__) || defined(__IOS__)
s32 imgh = source_rect.LowerRightCorner.Y * scale; s32 imgh = source_rect.LowerRightCorner.Y * scale;
#else
s32 imgh = source_rect.LowerRightCorner.Y;
#endif
s32 rowh = row_rect.getHeight(); s32 rowh = row_rect.getHeight();
if (imgh < rowh) if (imgh < rowh)
dest_pos.Y += (rowh - imgh) / 2; dest_pos.Y += (rowh - imgh) / 2;
@ -777,15 +766,9 @@ void GUITable::drawCell(const Cell *cell, video::SColor color,
video::SColor colors[] = {color,color,color,color}; video::SColor colors[] = {color,color,color,color};
#if defined(__ANDROID__) || defined(__IOS__)
core::rect<s32> image_pos(dest_pos.X, dest_pos.Y, core::rect<s32> image_pos(dest_pos.X, dest_pos.Y,
dest_pos.X + (image->getOriginalSize().Width * scale), dest_pos.X + (image->getOriginalSize().Width * scale),
dest_pos.Y + (image->getOriginalSize().Height * scale)); dest_pos.Y + (image->getOriginalSize().Height * scale));
#else
core::rect<s32> image_pos(dest_pos.X, dest_pos.Y,
dest_pos.X + image->getOriginalSize().Width,
dest_pos.Y + image->getOriginalSize().Height);
#endif
draw2DImageFilterScaled(driver, image, image_pos, source_rect, draw2DImageFilterScaled(driver, image, image_pos, source_rect,
&client_clip, colors, true); &client_clip, colors, true);