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

shellwindow: ensure text is set correctly and only when necessary

Browse Source 
Origin commit data
------------------
Commit: d372892ef5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
This commit is contained in:
Stefan Seyfried
2017-01-29 21:27:45 +01:00
committed by vanhofen
parent 199bf36a28
commit 1956eb6bba
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/gui/widget/shellwindow.cpp
View File

@@ -82,6 +82,16 @@ static int read_line(int fd, struct pollfd *fds, char *b, size_t sz)
return i;
}
static std::string lines2txt(list<std::string> &lines)
{
std::string txt = "";
for (std::list<std::string>::const_iterator it = lines.begin(), end = lines.end(); it != end; ++it) {
txt += *it;
txt += '\n';
}
return txt;
}
void CShellWindow::exec()
{
std::string cmd;
@@ -187,15 +197,8 @@ void CShellWindow::exec()
now = time_monotonic_ms();
if (lines.size() > lines_max)
lines.pop_front();
txt = "";
bool first = true;
for (std::list<std::string>::const_iterator it = lines.begin(), end = lines.end(); it != end; ++it) {
if (!first)
txt += '\n';
first = false;
txt += *it;
}
if (((lines_read >= lines_max) && (lastPaint + 100 < now)) || (lastPaint + 250 < now)) {
txt = lines2txt(lines);
textBox->setText(&txt, textBox->getWindowsPos().iWidth, false);
if (!textBox->isPainted())
if (mode & VERBOSE) textBox->paint();
@@ -211,6 +214,7 @@ void CShellWindow::exec()
now = time_monotonic_ms();
if (!ok || (r < 1 && dirty && lastPaint + 250 < now)) {
txt = lines2txt(lines);
textBox->setText(&txt, textBox->getWindowsPos().iWidth, false);
if (!textBox->isPainted())
if (mode & VERBOSE) textBox->paint();
@@ -220,6 +224,7 @@ void CShellWindow::exec()
} while(ok);
if (mode & VERBOSE) {
txt = lines2txt(lines);
txt += "\n...ready";
textBox->setText(&txt, textBox->getWindowsPos().iWidth, false);
}