mirror of
https://github.com/luanti-org/luanti.git
synced 2025-08-06 17:41:04 +00:00
Code style fixes.
This commit is contained in:
parent
24e9db07ec
commit
af3f696423
43 changed files with 493 additions and 484 deletions
|
@ -3892,7 +3892,7 @@ void GUIFormSpecMenu::acceptInput(FormspecQuitMode quitmode)
|
|||
fields[name] = "CHG:" + itos(e->getPos());
|
||||
else
|
||||
fields[name] = "VAL:" + itos(e->getPos());
|
||||
}
|
||||
}
|
||||
} else if (s.ftype == f_AnimatedImage) {
|
||||
// No dynamic cast possible due to some distributions shipped
|
||||
// without rtti support in Irrlicht
|
||||
|
@ -5056,7 +5056,7 @@ double GUIFormSpecMenu::calculateImgsize(const parserData &data)
|
|||
{
|
||||
// must stay in sync with ClientDynamicInfo::calculateMaxFSSize
|
||||
|
||||
const double screen_dpi = RenderingEngine::getDisplayDensity() * 96;
|
||||
const double screen_dpi = RenderingEngine::getDisplayDensity() * 96;
|
||||
const double gui_scaling = g_settings->getFloat("gui_scaling", 0.5f, 42.0f);
|
||||
|
||||
// Fixed-size mode
|
||||
|
|
|
@ -777,7 +777,7 @@ void TextDrawer::place(const core::rect<s32> &dest_rect)
|
|||
std::max(f.margin, p.margin);
|
||||
|
||||
} else if (f.rect.UpperLeftCorner.X - f.margin <= left &&
|
||||
f.rect.LowerRightCorner.X + f.margin >= right) {
|
||||
f.rect.LowerRightCorner.X + f.margin >= right) {
|
||||
// float taking all space
|
||||
left = right;
|
||||
}
|
||||
|
|
|
@ -475,7 +475,7 @@ void TouchControls::translateEvent(const SEvent &event)
|
|||
|
||||
toggleOverflowMenu();
|
||||
// refresh since visibility of buttons has changed
|
||||
element = m_guienv->getRootGUIElement()->getElementFromPoint(touch_pos);
|
||||
element = m_guienv->getRootGUIElement()->getElementFromPoint(touch_pos);
|
||||
// continue processing, but avoid accidentally placing a node
|
||||
// when closing the overflow menu
|
||||
prevent_short_tap = true;
|
||||
|
|
|
@ -21,8 +21,8 @@ class GUITouchscreenLayout : public GUIModalMenu
|
|||
{
|
||||
public:
|
||||
GUITouchscreenLayout(gui::IGUIEnvironment* env,
|
||||
gui::IGUIElement* parent, s32 id,
|
||||
IMenuManager *menumgr, ISimpleTextureSource *tsrc);
|
||||
gui::IGUIElement* parent, s32 id,
|
||||
IMenuManager *menumgr, ISimpleTextureSource *tsrc);
|
||||
~GUITouchscreenLayout();
|
||||
|
||||
void regenerateGui(v2u32 screensize);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue