diff options
| author | louis <louis.braun@gmx.de> | 2014-02-01 13:04:22 +0100 |
|---|---|---|
| committer | louis <louis.braun@gmx.de> | 2014-02-01 13:04:22 +0100 |
| commit | af70b4e06b5229343a3a68935d84200d637d417b (patch) | |
| tree | 2d6f1ae0fb6158f0840c45e4cbae9f9b15317c23 /displaytracks.c | |
| parent | 0b29805c23c99922bbade2824d93126bab112316 (diff) | |
| download | skin-nopacity-af70b4e06b5229343a3a68935d84200d637d417b.tar.gz skin-nopacity-af70b4e06b5229343a3a68935d84200d637d417b.tar.bz2 | |
Fixed bugs that configured OSD top and left values are not correctly used in DisplayChannel, DisplayTracks, DisplayVolume and DisplayMessages
Diffstat (limited to 'displaytracks.c')
| -rw-r--r-- | displaytracks.c | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/displaytracks.c b/displaytracks.c index 5f2c6dd..7c2a1e1 100644 --- a/displaytracks.c +++ b/displaytracks.c @@ -40,40 +40,40 @@ void cNopacityDisplayTracks::SetGeometry(void) { int top, left; switch(config.GetValue("tracksPosition")) { case 0: //middle bottom - top = cOsd::OsdHeight() - cOsd::OsdTop() - height - config.GetValue("tracksBorderHorizontal"); - left = (cOsd::OsdWidth() - width) / 2; + top = geoManager->osdTop + geoManager->osdHeight - height - config.GetValue("tracksBorderVertical"); + left = geoManager->osdLeft + (geoManager->osdWidth - width) / 2; break; case 1: //left bottom - top = cOsd::OsdHeight() - cOsd::OsdTop() - height - config.GetValue("tracksBorderHorizontal"); - left = cOsd::OsdLeft(); + top = geoManager->osdTop + geoManager->osdHeight - height - config.GetValue("tracksBorderVertical"); + left = geoManager->osdLeft + config.GetValue("tracksBorderHorizontal"); break; case 2: //left middle - top = (cOsd::OsdHeight() - height) / 2; - left = cOsd::OsdLeft() + config.GetValue("tracksBorderVertical"); + top = geoManager->osdTop + (geoManager->osdHeight - height) / 2; + left = geoManager->osdLeft + config.GetValue("tracksBorderHorizontal"); break; case 3: //left top - top = cOsd::OsdTop() + config.GetValue("tracksBorderHorizontal"); - left = cOsd::OsdLeft() + config.GetValue("tracksBorderVertical"); + top = geoManager->osdTop + config.GetValue("tracksBorderVertical"); + left = geoManager->osdLeft + config.GetValue("tracksBorderHorizontal"); break; case 4: //top middle - top = cOsd::OsdTop() + config.GetValue("tracksBorderHorizontal"); - left = (cOsd::OsdWidth() - width) / 2; + top = geoManager->osdTop + config.GetValue("tracksBorderVertical"); + left = geoManager->osdLeft + (geoManager->osdWidth - width) / 2; break; case 5: //top right - top = cOsd::OsdTop() + config.GetValue("tracksBorderHorizontal"); - left = cOsd::OsdWidth() - cOsd::OsdLeft() - width - config.GetValue("tracksBorderVertical"); + top = geoManager->osdTop + config.GetValue("tracksBorderVertical"); + left = geoManager->osdLeft + geoManager->osdWidth - width - config.GetValue("tracksBorderHorizontal"); break; case 6: //right middle - top = (cOsd::OsdHeight() - height) / 2; - left = cOsd::OsdWidth() - cOsd::OsdLeft() - width - config.GetValue("tracksBorderVertical"); + top = geoManager->osdTop + (geoManager->osdHeight - height) / 2; + left = geoManager->osdLeft + geoManager->osdWidth - width - config.GetValue("tracksBorderHorizontal"); break; case 7: //right bottom - top = cOsd::OsdHeight() - cOsd::OsdTop() - height - config.GetValue("tracksBorderHorizontal"); - left = cOsd::OsdWidth() - cOsd::OsdLeft() - width - config.GetValue("tracksBorderVertical"); + top = geoManager->osdTop + geoManager->osdHeight - height - config.GetValue("tracksBorderVertical"); + left = geoManager->osdLeft + geoManager->osdWidth - width - config.GetValue("tracksBorderHorizontal"); break; default: //middle bottom - top = cOsd::OsdHeight() - cOsd::OsdTop() - height - config.GetValue("tracksBorderHorizontal"); - left = (cOsd::OsdWidth() - width) / 2; + top = geoManager->osdTop + geoManager->osdHeight - height - config.GetValue("tracksBorderVertical"); + left = geoManager->osdLeft + (geoManager->osdWidth - width) / 2; break; } osd = CreateOsd(left, top, width, height); |