From 5146f15e44d9523e3dc96bf0f5e0aeaf1bee9c2f Mon Sep 17 00:00:00 2001
From: louis <louis.braun@gmx.de>
Date: Fri, 10 Apr 2015 16:44:29 +0200
Subject: fixed bug that string tokens are not evaluated in area conditions

---
 views/displaymenudetailview.c |  2 +-
 views/displaypluginview.c     |  2 +-
 views/view.c                  | 12 ++++++------
 3 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'views')

diff --git a/views/displaymenudetailview.c b/views/displaymenudetailview.c
index f63f46c..1258861 100644
--- a/views/displaymenudetailview.c
+++ b/views/displaymenudetailview.c
@@ -224,7 +224,7 @@ void cDisplayMenuDetailView::InitTabs(void) {
     tmplView->InitViewTabIterator();
     cTemplateViewTab *tmplTab = NULL;
     while(tmplTab = tmplView->GetNextViewTab()) {
-        tmplTab->ParseDynamicParameters(&intTokens, true);
+        tmplTab->ParseDynamicParameters(&stringTokens, &intTokens, true);
         tmplTab->ClearDynamicFunctionParameters();
         tmplTab->ParseDynamicFunctionParameters(&stringTokens, &intTokens);
         if (tmplTab->DoExecute()) {
diff --git a/views/displaypluginview.c b/views/displaypluginview.c
index c861e79..f057f69 100644
--- a/views/displaypluginview.c
+++ b/views/displaypluginview.c
@@ -143,7 +143,7 @@ void cDisplayPluginView::SetTabs(void) {
     tmplView->InitViewTabIterator();
     cTemplateViewTab *tmplTab = NULL;
     while(tmplTab = tmplView->GetNextViewTab()) {
-        tmplTab->ParseDynamicParameters(&tabIntTokens, true);
+        tmplTab->ParseDynamicParameters(&tabStringTokens, &tabIntTokens, true);
         tmplTab->ClearDynamicFunctionParameters();
         tmplTab->ParseDynamicFunctionParameters(&tabStringTokens, &tabIntTokens);
         if (tmplTab->DoExecute()) {
diff --git a/views/view.c b/views/view.c
index 8ee8c09..09bae74 100644
--- a/views/view.c
+++ b/views/view.c
@@ -109,13 +109,13 @@ void cView::DrawViewElement(eViewElement ve, map <string,string> *stringTokens,
         //check if pixmap needs dynamic parameters  
         if ((!pix->Ready() || !pix->DoExecute()) && !pix->Scrolling()) {
             //parse dynamic parameters and initiate functions
-            pix->ParseDynamicParameters(intTokens, true);
+            pix->ParseDynamicParameters(stringTokens, intTokens, true);
             if (pix->Ready() && pix->DoExecute()) {
                 CreateViewPixmap(pixCurrent, pix);
             }
         } else {
             //parse dynamic parameters but not initiate functions
-            pix->ParseDynamicParameters(intTokens, false);
+            pix->ParseDynamicParameters(stringTokens, intTokens, false);
         }
         //if pixmap still not valid, skip
         if (!pix->Ready() && !pix->Scrolling()) {
@@ -917,9 +917,9 @@ cRect cViewListItem::DrawListItem(map <string,string> *stringTokens, map <string
             posItem = pix->GetPixmapSize();
         }
         if (!PixmapExists(pixCurrent)) {
-            pix->ParseDynamicParameters(intTokens, true);
+            pix->ParseDynamicParameters(stringTokens, intTokens, true);
         } else {
-            pix->ParseDynamicParameters(intTokens, false);            
+            pix->ParseDynamicParameters(stringTokens, intTokens, false);
         }
         if (!PixmapExists(pixCurrent) && pix->Ready() && pix->DoExecute() && !pix->Scrolling()) {
             CreateViewPixmap(pixCurrent, pix);
@@ -1087,9 +1087,9 @@ void cGrid::Draw(void) {
     while(pix = tmplViewElement->GetNextPixmap()) {
         PositionPixmap(pix);
         if (!PixmapExists(pixCurrent)) {
-            pix->ParseDynamicParameters(&intTokens, true);
+            pix->ParseDynamicParameters(&stringTokens, &intTokens, true);
         } else {
-            pix->ParseDynamicParameters(&intTokens, false);
+            pix->ParseDynamicParameters(&stringTokens, &intTokens, false);
         }
         if (!PixmapExists(pixCurrent) && pix->Ready() && pix->DoExecute() && !pix->Scrolling()) {
             CreateViewPixmap(pixCurrent, pix);
-- 
cgit v1.2.3