summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlouis <louis.braun@gmx.de>2016-02-20 17:22:11 +0100
committerlouis <louis.braun@gmx.de>2016-02-20 17:22:11 +0100
commit46a716da7654a593bbd2e79b19713cd521612452 (patch)
treef904e59731df7e0d944a5878a8a2793648527ed9
parent21732b177721386ab23ac6a3fa1d145e0049aee4 (diff)
downloadvdr-plugin-skindesigner-46a716da7654a593bbd2e79b19713cd521612452.tar.gz
vdr-plugin-skindesigner-46a716da7654a593bbd2e79b19713cd521612452.tar.bz2
fixed bug in default lists
-rw-r--r--coreengine/listelements.c7
-rw-r--r--coreengine/listelements.h3
-rw-r--r--skins/metrixhd/xmlfiles/displaymenudefault.xml2
3 files changed, 10 insertions, 2 deletions
diff --git a/coreengine/listelements.c b/coreengine/listelements.c
index a22a752..240da4a 100644
--- a/coreengine/listelements.c
+++ b/coreengine/listelements.c
@@ -273,6 +273,13 @@ void cLeMenuDefault::CheckProgressBar(const char *text, int tab) {
tokenContainer->AddIntToken(32 + tab, len);
}
+void cLeMenuDefault::Clear(void) {
+ if (current && currentElement) {
+ currentElement->Close();
+ }
+ cViewElement::Close();
+ dirty = false;
+}
/******************************************************************
* cVeMenuMain
******************************************************************/
diff --git a/coreengine/listelements.h b/coreengine/listelements.h
index 9b3dd78..e1520c3 100644
--- a/coreengine/listelements.h
+++ b/coreengine/listelements.h
@@ -30,7 +30,7 @@ public:
bool DoScroll(void) { return current; };
virtual void RenderCurrent(void) { };
void Close(void);
- void Clear(void);
+ virtual void Clear(void);
};
/******************************************************************
@@ -70,6 +70,7 @@ public:
void SetPlugin(const char *plugName) { this->plugName = plugName; };
void SetTokenContainer(void);
bool Parse(bool forced = true);
+ void Clear(void);
};
/******************************************************************
diff --git a/skins/metrixhd/xmlfiles/displaymenudefault.xml b/skins/metrixhd/xmlfiles/displaymenudefault.xml
index de4b49a..b894264 100644
--- a/skins/metrixhd/xmlfiles/displaymenudefault.xml
+++ b/skins/metrixhd/xmlfiles/displaymenudefault.xml
@@ -106,7 +106,7 @@
<areascroll condition="not{separator} ++ not{setup}" scrollelement="column1" mode="forthandback" orientation="horizontal" delay="1000" scrollspeed="medium" x="1%" width="{column1width}" layer="3">
<drawtext name="column1" x="{column1x}" width="{column1width}" valign="center" font="{light}" fontsize="90%" color="{clrWhite}" text="{column1}" />
</areascroll>
- <area condition="not{separator} ++ not{setup}" x="1%" width="100%" layer="3">
+ <area condition="not{separator} ++ not{setup}" x="1%" width="100%" layer="4">
<drawtext condition="{column2set}" x="{column2x}" valign="center" font="{light}" fontsize="90%" width="{column2width}" color="{clrWhite}" text="{column2}" />
<drawtext condition="{column3set}" x="{column3x}" valign="center" font="{light}" fontsize="90%" width="{column3width}" color="{clrWhite}" text="{column3}" />
<drawtext condition="{column4set}" x="{column4x}" valign="center" font="{light}" fontsize="90%" width="{column4width}" color="{clrWhite}" text="{column4}" />