diff options
| author | Ethan Yonker <dees_troy@teamw.in> | 2015-12-28 21:54:50 +0100 |
|---|---|---|
| committer | Ethan Yonker <dees_troy@teamw.in> | 2016-01-27 17:53:13 +0100 |
| commit | fbb4353a247157d32208f8f133cd1ee42f4fbc49 (patch) | |
| tree | 6f819fbdd21f2adef4f7ba4a5b4d02054cc02f29 /gui/terminal.cpp | |
| parent | Adopted Storage support (diff) | |
| download | android_bootable_recovery-fbb4353a247157d32208f8f133cd1ee42f4fbc49.tar android_bootable_recovery-fbb4353a247157d32208f8f133cd1ee42f4fbc49.tar.gz android_bootable_recovery-fbb4353a247157d32208f8f133cd1ee42f4fbc49.tar.bz2 android_bootable_recovery-fbb4353a247157d32208f8f133cd1ee42f4fbc49.tar.lz android_bootable_recovery-fbb4353a247157d32208f8f133cd1ee42f4fbc49.tar.xz android_bootable_recovery-fbb4353a247157d32208f8f133cd1ee42f4fbc49.tar.zst android_bootable_recovery-fbb4353a247157d32208f8f133cd1ee42f4fbc49.zip | |
Diffstat (limited to 'gui/terminal.cpp')
| -rw-r--r-- | gui/terminal.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gui/terminal.cpp b/gui/terminal.cpp index 044782e4e..29b0e8469 100644 --- a/gui/terminal.cpp +++ b/gui/terminal.cpp @@ -32,8 +32,8 @@ extern "C" { #include "../twcommon.h" -#include "../minuitwrp/minui.h" } +#include "../minuitwrp/minui.h" #include "rapidxml.hpp" #include "objects.hpp" @@ -869,10 +869,10 @@ void GUITerminal::RenderItem(size_t itemindex, int yPos, bool selected) // render cursor int cursorX = engine->getCursorX(); std::string leftOfCursor = line.substr(0, cursorX); - int x = gr_measureEx(leftOfCursor.c_str(), mFont->GetResource()); + int x = gr_ttf_measureEx(leftOfCursor.c_str(), mFont->GetResource()); // note that this single character can be a UTF-8 sequence std::string atCursor = (size_t)cursorX < line.length() ? line.substr(cursorX, 1) : " "; - int w = gr_measureEx(atCursor.c_str(), mFont->GetResource()); + int w = gr_ttf_measureEx(atCursor.c_str(), mFont->GetResource()); gr_color(mFontColor.red, mFontColor.green, mFontColor.blue, mFontColor.alpha); gr_fill(mRenderX + x, yPos, w, actualItemHeight); gr_color(mBackgroundColor.red, mBackgroundColor.green, mBackgroundColor.blue, mBackgroundColor.alpha); @@ -890,7 +890,7 @@ void GUITerminal::InitAndResize() // make sure the shell is started engine->initPty(); // send window resize - int charWidth = gr_measureEx("N", mFont->GetResource()); + int charWidth = gr_ttf_measureEx("N", mFont->GetResource()); engine->setSize(mRenderW / charWidth, GetDisplayItemCount(), mRenderW, mRenderH); } |