Changeset 15152

Timestamp:

04/05/12 20:31:04 (10 years ago)

Author:

nit

Message:

[titan] add pictur for selection

Location:

titan/titan

Files:

• skin.h (modified) (6 diffs)
• skinadjust.h (modified) (1 diff)
• struct.h (modified) (1 diff)

titan/titan/skin.h

@@ -1022 +1022 @@
         free(node->font);
         node->font = NULL;
+        
+        free(node->selectpic);
+        node->selectpic = NULL;
 
         free(node->pic);
@@ -3128 +3131 @@
         if(node->type & MULTIPROGRESSBAR)
                 drawmultiprogressbar(node);
+        if(node->selectpic != NULL && !(node->type & FILELIST))
+                drawpic(node->selectpic, node->iposx, node->iposy, node->rpicwidth, node->rpicheight, node->iwidth, node->iheight, CENTER, MIDDLE);
         if(node->pic != NULL && !(node->type & FILELIST))
                 drawpic(node->pic, node->iposx, node->iposy, node->rpicwidth, node->rpicheight, node->iwidth, node->iheight, node->halign, node->valign);
@@ -3267 +3272 @@
         int selcol = convertcol("listboxselect");
         int markcol = convertcol("markcol");
+        char* selectpic = getskinconfig("selectpic", NULL);
 
         node->poscount = 0;
@@ -3324 +3330 @@
 
                 child->bordersize = 0;
+                if(status.listboxselecttype == 3)
+                {
+                        changebgpic(child, NULL);
+                        if(child->bgcol == markcol)
+                                child->bgcol = child->bordercol;
+                }
                 if(child->bgcol == selcol) //&& status.listboxselecttype == 1)
                         child->bgcol = child->bordercol;
@@ -3366 +3378 @@
                         else
                                 found->fontcol = selcol;
+                }
+                else if(status.listboxselecttype == 3)
+                {
+                        changebgpic(found, selectpic);
+                        if(found->bgcol != markcol)
+                                found->bordercol = found->bgcol;
+                        if(status.markmodus > 0)
+                                found->bgcol = markcol;
                 }
 
@@ -3980 +4000 @@
 }
 
+int changeselectpic(struct skin* node, char* text)
+{
+        debug(1000, "in");
+        int ret = 1;
+
+        if(node != NULL)
+        {
+                free(node->selectpic);
+                if(text != NULL)
+                        node->selectpic = changepicpath(text);
+                else
+                        node->selectpic = text;
+                ret = 0;
+        }
+        debug(1000, "out");
+
+        return ret;
+}
+
 int changetitle(struct skin* node, char* text)
 {

titan/titan/skinadjust.h

@@ -24 +24 @@
         addchoicebox(listboxselecttype, "1", _("bar"));
         addchoicebox(listboxselecttype, "2", _("text"));
+        addchoicebox(listboxselecttype, "3", _("picture"));
         setchoiceboxselection(listboxselecttype, getskinconfig("listboxselecttype", NULL));
         

titan/titan/struct.h

@@ -530 +530 @@
         long titlebgcol2;
         long progresscol;
+        char* selectpic;
         char* pic;
         int16_t picwidth;