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

Merge branch 'master' into pu/fb-setmode

Browse Source 
# Conflicts:
#	src/gui/components/cc_frm_window.h


Origin commit data
------------------
Commit: aaa34d8887
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
This commit is contained in:
Thilo Graf
2017-05-11 12:18:38 +02:00
parent 509dff5c83 653c5af07c
commit 801e94d938
11 changed files with 62 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/components/cc_frm_window.cpp
View File

@@ -150,7 +150,7 @@ void CComponentsWindow::initVarWindow( const int& x_pos, const int& y_pos, const
ccw_buttons = 0; //no header buttons
ccw_show_footer = true;
ccw_show_header = true;
ccw_align_mode = CTextBox::NO_AUTO_LINEBREAK;
ccw_align_mode = DEFAULT_TITLE_ALIGN;
ccw_show_l_sideber = false;
ccw_show_r_sideber = false;
ccw_w_sidebar = 40;
@@ -191,7 +191,7 @@ void CComponentsWindow::initWindowPos()
y = frameBuffer->getScreenY();
}
void CComponentsWindow::setWindowCaption(neutrino_locale_t locale_text, const int& align_mode)
void CComponentsWindow::setWindowCaption(neutrino_locale_t locale_text, const cc_title_alignment_t& align_mode)
{
ccw_caption = g_Locale->getText(locale_text);
ccw_align_mode = align_mode;