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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Conflicts:
	src/gui/components/cc_frm_scrollbar.cpp
	src/gui/eventlist.cpp
	src/gui/widget/progresswindow.cpp


Origin commit data
------------------
Commit: 9b97705a3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)
This commit is contained in:
vanhofen
2017-06-20 14:24:59 +02:00
parent a95ede2649 0f3b5e5eaf
commit c7c36aceb1
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/components/cc_frm_scrollbar.cpp
View File

@@ -94,7 +94,7 @@ void CComponentsScrollBar::initVarSbForm(const int& count, const fb_pixel_t& col
sb_down_obj = NULL;
sb_segments_obj = NULL;
setCorner(RADIUS_NONE, CORNER_ALL); //NI
corner_type = CORNER_NONE;
sb_up_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_UP) ;
sb_down_icon = frameBuffer->getIconPath(NEUTRINO_ICON_BUTTON_DOWN);