Changeset 38559 for titan/titan/skin.h

Timestamp:

09/04/16 17:03:16 (7 years ago)

Author:

obi

Message:

fix

File:

• titan/titan/skin.h (modified) (6 diffs)

titan/titan/skin.h

@@ -361 +361 @@
 {
         int ret = -1;
-        char *buf = NULL, *tmpstr = NULL;
-        tmpstr = ostrcat(value, NULL, 0, 0);
+        char *buf = NULL;
 
         if(strcasecmp(value, "left") == 0)
@@ -432 +431 @@
         else if(strcasecmp(value, "minitvsize") == 0)
         {
-                free(tmpstr), tmpstr = NULL;
                 if(getskinconfigint("minitv", NULL) == 1)
-                        tmpstr = ostrcat("100%", NULL, 0, 0);
+                        value = getskinconfig("minitvsizemax", NULL);
                 else
-                        tmpstr = getskinconfig(value, NULL);
-printf("11111111=%s tmpstr=%s ret=%d\n", value, tmpstr, ret);
-
+                        value = getskinconfig(value, NULL);
+
+                if(value == NULL)
+                        value = ostrcat("100%", NULL, 0, 0);
         }
 
         if(proz != NULL && ret == -1)
         {
-                buf = strchr(tmpstr, '%');
-
+                buf = strchr(value, '%');
                 if(buf != NULL)
                 {
                         buf[0] = '\0';
-                        ret = atoi(tmpstr);
+                        ret = atoi(value);
                         *proz = 1;
                         buf[0] = '%';
                 }
                 else
-                        ret = atoi(tmpstr);
-        }
-//      free(tmpstr), tmpstr = NULL;
+                        ret = atoi(value);
+        }
+        printf("55555555\n");
 
         return ret;
 }
+
 
 struct skin* checkscreen(char* screenname)
@@ -3279 +3278 @@
         node->flag = setbit(node->flag, 0);
 
-        if(node->name != NULL && ostrstr(node->name, "minitvbg") != NULL && getskinconfigint("minitv", NULL) == 1)
-        {
-                printf("hid node: %s\n", node->name );
-                node->hidden = YES;
-        }
-
         if(node->bordersize > 0)
         {
@@ -4020 +4013 @@
                                         free(status.drawallwaysbg[i]);
                                 status.drawallwaysbg[i] = savescreen(status.drawallways[i]);
+        
                                 ret = drawscreen(status.drawallways[i], screencalc, 1);
                         }
@@ -4037 +4031 @@
                 drawnode(node, 1);
         drawscreenalways(node, screencalc);
+
         blitfb(0);
         m_unlock(&status.drawingmutex, 0);
@@ -4271 +4266 @@
                         parent = oldparent;
 
+                // hid minitvbg
+                if(child->name != NULL && ostrstr(child->name, "minitvbg") != NULL && getskinconfigint("minitv", NULL) == 1)
+                        child->hidden = YES;
+
                 if(setnodeattr(child, parent, screencalc) == 0 && screencalc == 0)
                         drawnode(child, 1);