mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 18:31:12 +02:00
Merge branch 'master' into pu/msgbox
Conflicts:
src/gui/moviebrowser/mb.cpp
Origin commit data
------------------
Commit: 3efaac5725
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)
This commit is contained in:
@@ -121,7 +121,7 @@ void CComponentsHeader::initVarHeader( const int& x_pos, const int& y_pos, const
|
||||
cch_col_text = COL_MENUHEAD_TEXT;
|
||||
cch_caption_align = CTextBox::NO_AUTO_LINEBREAK;
|
||||
cch_items_y = CC_CENTERED;
|
||||
cch_offset = 8;
|
||||
cch_offset = OFFSET_INNER_MID;
|
||||
cch_icon_x = cch_offset;
|
||||
cch_icon_w = 0;
|
||||
cch_clock_w = 0;
|
||||
|
Reference in New Issue
Block a user