mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-09-01 09:51:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'cst-next'

Browse Source
This commit is contained in:
Stefan Seyfried
2016-01-08 19:52:41 +01:00
parent f99c3ebc37 11e480b6e8
commit b53fbaf327
25 changed files with 194 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -89,7 +89,7 @@ void CShellWindow::exec()
int w_shell = frameBuffer->getScreenWidth();
unsigned int lines_max = h_shell / font->getHeight();
list<std::string> lines;
CBox textBoxPosition(frameBuffer->getScreenX(), frameBuffer->getScreenX(), w_shell, h_shell);
CBox textBoxPosition(frameBuffer->getScreenX(), frameBuffer->getScreenY(), w_shell, h_shell);
if (textBox == NULL){
textBox = new CTextBox(cmd.c_str(), font, CTextBox::BOTTOM, &textBoxPosition);
textBox->enableSaveScreen(false);
@@ -251,7 +251,8 @@ void CShellWindow::showResult()
int xpos = frameBuffer->getScreenWidth() - b_width;
int ypos = frameBuffer->getScreenHeight() - b_height;
CComponentsButton btn(xpos, ypos, b_width, b_height, LOCALE_MESSAGEBOX_BACK, NEUTRINO_ICON_BUTTON_OKAY, NULL, true, true);
btn.paint();
btn.setColorBody(COL_MENUCONTENT_PLUS_0);
btn.paint(false);
}
neutrino_msg_t msg;

2
src/gui/widget/textbox.cpp
View File

@@ -580,7 +580,7 @@ void CTextBox::refreshText(void)
}
//detect corrupt position values
if ((ax<=0) || (ay<=0)){
if ((ax<0) || (ay<0)){
dprintf(DEBUG_NORMAL, "\033[33m[CTextBox] [%s - %d] ERROR! position out of range: ax = %d, ay = %d, dx = %d, dy = %d\033[0m\n", __func__, __LINE__, ax, ay, dx, dy);
return;
}