Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Conflicts:
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0288091f69
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-25 (Sun, 25 Sep 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-09-25 00:18:22 +02:00
4 changed files with 7 additions and 9 deletions

View File

@@ -273,7 +273,7 @@ void CMenuItem::paintItemCaption(const bool select_mode, const char * right_text
}
CComponentsShapeSquare col(stringstartposOption, y + 2, dx - stringstartposOption + x - 2, item_height - 4, NULL, false, right_frame_col, right_bg_col);
col.setFrameThickness(1); //NI
col.setCorner(RADIUS_LARGE);
col.setCorner(RADIUS_SMALL);
col.paint(false);
}
if (*right_text) {