BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Rename height to scale for openConsole() (#5139)

Browse Source 
For Game::openConsole() and GUIChatConsole::openConsole() the
parameter name 'height' is misleading because it's actually a
percentage of the screen/window height.
This commit is contained in:
Zeno- 2017-01-29 19:26:00 +10:00 committed by GitHub
parent 3eecc6ff44
commit 707e27b5c2
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game.cpp
View File

@ -1372,7 +1372,7 @@ protected:
void dropSelectedItem(); void dropSelectedItem();
void openInventory(); void openInventory();
void openConsole(float height, const wchar_t *line=NULL); void openConsole(float scale, const wchar_t *line=NULL);
void toggleFreeMove(float *statustext_time); void toggleFreeMove(float *statustext_time);
void toggleFreeMoveAlt(float *statustext_time, float *jump_timer); void toggleFreeMoveAlt(float *statustext_time, float *jump_timer);
void toggleFast(float *statustext_time); void toggleFast(float *statustext_time);
@ -2779,15 +2779,17 @@ void Game::openInventory()
} }
void Game::openConsole(float height, const wchar_t *line) void Game::openConsole(float scale, const wchar_t *line)
{ {
assert(scale > 0.0f && scale <= 1.0f);
#ifdef __ANDROID__ #ifdef __ANDROID__
porting::showInputDialog(gettext("ok"), "", "", 2); porting::showInputDialog(gettext("ok"), "", "", 2);
m_android_chat_open = true; m_android_chat_open = true;
#else #else
if (gui_chat_console->isOpenInhibited()) if (gui_chat_console->isOpenInhibited())
return; return;
gui_chat_console->openConsole(height); gui_chat_console->openConsole(scale);
if (line) { if (line) {
gui_chat_console->setCloseOnEnter(true); gui_chat_console->setCloseOnEnter(true);
gui_chat_console->replaceAndAddToHistory(line); gui_chat_console->replaceAndAddToHistory(line);

8
src/guiChatConsole.cpp
View File

@ -116,11 +116,13 @@ GUIChatConsole::~GUIChatConsole()
m_font->drop(); m_font->drop();
} }
void GUIChatConsole::openConsole(f32 height) void GUIChatConsole::openConsole(f32 scale)
{ {
assert(scale > 0.0f && scale <= 1.0f);
m_open = true; m_open = true;
m_desired_height_fraction = height; m_desired_height_fraction = scale;
m_desired_height = height * m_screensize.Y; m_desired_height = scale * m_screensize.Y;
reformatConsole(); reformatConsole();
m_animate_time_old = getTimeMs(); m_animate_time_old = getTimeMs();
IGUIElement::setVisible(true); IGUIElement::setVisible(true);

2
src/guiChatConsole.h
View File

@ -41,7 +41,7 @@ public:
// Open the console (height = desired fraction of screen size) // Open the console (height = desired fraction of screen size)
// This doesn't open immediately but initiates an animation. // This doesn't open immediately but initiates an animation.
// You should call isOpenInhibited() before this. // You should call isOpenInhibited() before this.
void openConsole(f32 height); void openConsole(f32 scale);
bool isOpen() const; bool isOpen() const;