mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-28 07:51:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix commit c3a7bcfd5b

Browse Source 
- Use indexes for font parameter in formatDeleteMsg() & cutString()


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d5edc29e6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-13 (Sat, 13 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2016-08-13 15:58:06 +02:00
parent 6e4d4c45fc
commit 8ef5e4b610
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/system/helpers.cpp
View File

@@ -44,6 +44,7 @@
#include <linux/hdreg.h> #include <linux/hdreg.h>
#include <linux/fs.h> #include <linux/fs.h>
#include "debug.h" #include "debug.h"
#include <global.h>
#include <system/helpers.h> #include <system/helpers.h>
#include <gui/update_ext.h> #include <gui/update_ext.h>
using namespace std; using namespace std;
@@ -438,21 +439,22 @@ std::string trim(std::string &str, const std::string &trimChars /*= " \n\r\t"*/)
return result.erase(0, result.find_first_not_of(trimChars)); return result.erase(0, result.find_first_not_of(trimChars));
} }
std::string cutString(const std::string str, Font *msgFont, const int width) std::string cutString(const std::string str, int msgFont, const int width)
{ {
Font *msgFont_ = g_Font[msgFont];
std::string ret = str; std::string ret = str;
ret = trim(ret); ret = trim(ret);
int sw = msgFont->getRenderWidth(ret); int sw = msgFont_->getRenderWidth(ret);
if (sw <= width) if (sw <= width)
return ret; return ret;
else { else {
std::string z = "..."; std::string z = "...";
int zw = msgFont->getRenderWidth(z); int zw = msgFont_->getRenderWidth(z);
if (width <= 2*zw) if (width <= 2*zw)
return ret; return ret;
do { do {
ret = ret.substr(0, ret.length()-1); ret = ret.substr(0, ret.length()-1);
sw = msgFont->getRenderWidth(ret); sw = msgFont_->getRenderWidth(ret);
} while (sw+zw > width); } while (sw+zw > width);
ret = trim(ret) + z; ret = trim(ret) + z;
} }

4
src/system/helpers.h
View File

@@ -37,8 +37,6 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/types.h> #include <sys/types.h>
#include <driver/fontrenderer.h>
int my_system(const char * cmd); int my_system(const char * cmd);
int my_system(int argc, const char *arg, ...); /* argc is number of arguments including command */ int my_system(int argc, const char *arg, ...); /* argc is number of arguments including command */
@@ -69,7 +67,7 @@ std::string getFileName(std::string &file);
std::string getFileExt(std::string &file); std::string getFileExt(std::string &file);
std::string getNowTimeStr(const char* format); std::string getNowTimeStr(const char* format);
std::string trim(std::string &str, const std::string &trimChars = " \n\r\t"); std::string trim(std::string &str, const std::string &trimChars = " \n\r\t");
std::string cutString(const std::string str, Font *msgFont, const int width); std::string cutString(const std::string str, int msgFont, const int width);
std::string strftime(const char *format, const struct tm *tm); std::string strftime(const char *format, const struct tm *tm);
std::string strftime(const char *format, time_t when, bool gm = false); std::string strftime(const char *format, time_t when, bool gm = false);
time_t toEpoch(std::string &date); time_t toEpoch(std::string &date);