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

Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
This commit is contained in:
vanhofen
2016-10-10 16:45:30 +02:00
parent 4bce5144ba 892603fe68
commit 248b6c8684
88 changed files with 525 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gui/volumebar.cpp
View File

@@ -127,14 +127,14 @@ void CVolumeBar::initVolumeBarPosition()
if (CNeutrinoApp::getInstance()->getChannellistIsVisible() == true)
y += std::max(39, g_Font[SNeutrinoSettings::FONT_TYPE_MENU_TITLE]->getHeight()) + v_spacer;
else if (g_settings.mode_clock)
y = clock_y + clock_height + v_spacer + SHADOW_OFFSET;
y = clock_y + clock_height + v_spacer + OFFSET_SHADOW;
}
x = sw - width - x_corr;
break;
}
case VOLUMEBAR_POS_TOP_LEFT:
if (CMoviePlayerGui::getInstance().osdTimeVisible())
y = clock_y + clock_height + v_spacer + SHADOW_OFFSET;
y = clock_y + clock_height + v_spacer + OFFSET_SHADOW;
break;
case VOLUMEBAR_POS_BOTTOM_LEFT:
y = (sh + frameBuffer->getScreenY()) - height - v_spacer;