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

- shellwindow: fix position of button; use default color

Browse Source 
* add comment to termwindow class; correct positioning of button isn't possible atm

Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2018-01-20 17:03:28 +01:00
committed by Thilo Graf
parent 3b907d739f
commit c1697a1ddb
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -226,7 +226,7 @@ void CShellWindow::exec()
if (mode & VERBOSE) { if (mode & VERBOSE) {
txt = lines2txt(lines); txt = lines2txt(lines);
txt += "\n...ready"; txt += "\n... ready";
textBox->setText(&txt, textBox->getWindowsPos().iWidth, false); textBox->setText(&txt, textBox->getWindowsPos().iWidth, false);
} }
@@ -274,10 +274,10 @@ void CShellWindow::showResult()
if (show_button){ if (show_button){
int b_width = 150; int b_width = 150;
int b_height = 35; int b_height = 35;
int xpos = frameBuffer->getScreenWidth() - b_width; int xpos = frameBuffer->getScreenX() + frameBuffer->getScreenWidth() - OFFSET_INNER_MID - b_width;
int ypos = frameBuffer->getScreenHeight() - b_height; int ypos = frameBuffer->getScreenY() + frameBuffer->getScreenHeight() - OFFSET_INNER_SMALL - b_height;
CComponentsButton btn(xpos, ypos, b_width, b_height, LOCALE_MESSAGEBOX_BACK, NEUTRINO_ICON_BUTTON_OKAY, NULL, true, true); CComponentsButton btn(xpos, ypos, b_width, b_height, LOCALE_MESSAGEBOX_BACK, NEUTRINO_ICON_BUTTON_OKAY, NULL, true, true);
btn.setColorBody(COL_MENUCONTENT_PLUS_0); //btn.setColorBody(COL_MENUCONTENT_PLUS_0);
btn.paint(false); btn.paint(false);
} }

3
src/gui/widget/termwindow.cpp
View File

@@ -97,6 +97,9 @@ void CTermWindow::showResult()
if (show_button) { if (show_button) {
int b_width = 150; int b_width = 150;
int b_height = 35; int b_height = 35;
/*
we need the dimensions of yaft window to place the button correctly
*/
int xpos = frameBuffer->getScreenWidth() - b_width; int xpos = frameBuffer->getScreenWidth() - b_width;
int ypos = frameBuffer->getScreenHeight() - b_height; int ypos = frameBuffer->getScreenHeight() - b_height;
CComponentsButton btn(xpos, ypos, b_width, b_height, LOCALE_MESSAGEBOX_BACK, NEUTRINO_ICON_BUTTON_OKAY, NULL, true, true); CComponentsButton btn(xpos, ypos, b_width, b_height, LOCALE_MESSAGEBOX_BACK, NEUTRINO_ICON_BUTTON_OKAY, NULL, true, true);