Changeset 24813

Timestamp:

11/08/13 00:32:07 (8 years ago)

Author:

nit

Message:

 

File:

• titan/titan/skin_new.h (modified) (17 diffs)

titan/titan/skin_new.h

@@ -3073 +3073 @@
 //flag 0: draw all parts before node
 //flag 1: draw all parts after node
-struct skin* drawnodepart(struct skin* tmp, struct skin* screen, struct skin* node, int flag)
+struct skin* drawnodepart(struct skin* tmp, struct skin* screen, struct skin* parent, struct skin* node, int flag)
 {
         int posx = 0, posy = 0, width = 0, height = 0;
@@ -3079 +3079 @@
         
         if(screen == NULL || node == NULL || screen == node) return NULL;
+        if(node->hidden == YES || parent->hidden == YES || node->locked == YES || parent->locked == YES) return NULL;
         if(checkbit(node->flag, 1) == 0 || checkbit(screen->flag, 1) == 1) return NULL;
-printf("drawnodepart %s %d\n", node->name, flag);       
+        if(checkbit(parent->flag, 0) == 0) return NULL;
+
+//printf("drawnodepart %s %d\n", node->name, flag);     
         if(flag == 0) 
                 child = screen;
@@ -3098 +3101 @@
                 }
                 
-                if(getrectdiff(node->rposx, node->rposy, node->rwight, node->rheight, child->rposx, child->rposy, child->rwidth, child->rheight, &posx, &posy, &weight, &height) == 1)
+                if(getrectdiff(node->rposx, node->rposy, node->rwidth, node->rheight, child->rposx, child->rposy, child->rwidth, child->rheight, &posx, &posy, &width, &height) == 1)
                 {
                         if(child == screen)
@@ -3112 +3115 @@
                         //      drawbginnercol(node);
                         //else
-printf("drawbgcolpart %s\n", child->name);
+//printf("drawbgcolpart %s x=%d y=%d w=%d h=%d\n", child->name, posx, posy, width, height);
                                 drawbgcolpart(posx, posy, width, height, child->bgspace, child->bgcol, child->transparent);
                 }
+                //if(child->gradient > 0)
+                //      drawbggradient(child);
                 
                 if(child == screen)
@@ -3134 +3139 @@
         
         node->flag = setbit(node->flag, 0);
-printf("%s %d\n", node->name, node->flag);
         if(checkbit(node->flag, 1) == 0) return;
-        node->flag = clearbit(node->flag, 1);
+//printf("%s %d\n", node->name, node->flag);
+        //node->flag = clearbit(node->flag, 1);
 
         if(node->bordersize > 0)
@@ -3385 +3390 @@
                 {
                         node->pagecount++;
-                        if(found == NULL) change = node->pagecount;
+                        if(node->aktpage == -1)
+                        {
+                                if(found == NULL) change = node->pagecount;
+                        }
+                        else
+                        {
+                                if(node->pagecount == node->aktpage) change = node->pagecount;
+                        }
                         node->poscount = child->rheight;
                 }
@@ -3400 +3412 @@
                 last = child;
 
-                if(change == node->pagecount && checkbit(child->flag, 1) == 0) change = 0;
+                if(node->aktpage == -1)
+                {
+                        if(change == node->pagecount && checkbit(child->flag, 1) == 0) change = 0;
+                }
+                else
+                {
+                        if(change == node->aktpage && checkbit(child->flag, 1) == 0) change = 0;
+                }
 
                 if(node->aktline == -1 && child->pagecount == node->aktpage)
@@ -3410 +3429 @@
                         found = child;
 
-                child->bordersize = 0;
+                changebordersize(child, 0);
                 if(status.listboxselecttype == 3)
                 {
@@ -3438 +3457 @@
                 if(status.listboxselecttype == 0)
                 {
-                        found->bordersize = 1;
+                        changebordersize(found, 1);
                         if(status.markmodus > 0)
                         {
@@ -3526 +3545 @@
                         if(status.markmodus > 0)
                         {
-                                found->bordersize = 1;
+                                changebordersize(found, 1);
                                 found->bordercol = status.markcol;
                                 int i = 0;
@@ -3535 +3554 @@
                                         if(tmpskin != NULL)
                                         {
-                                                tmpskin->bordersize = 1;
+                                                changebordersize(tmpskin, 1);
                                                 tmpskin->bordercol = status.markcol;
                                         }
@@ -3655 +3674 @@
 
         if(node->child != NULL && status.picbordersize > 0)
-                node->bordersize = status.picbordersize;
+                changebordersize(node, status.picbordersize);
 
         if(node->skinfunc != NULL)
@@ -3751 +3770 @@
         }
 
-        if(checkbit(parent->flag, 1) == 1) node->flag = setbit(node->flag, 1);
+        //if(checkbit(parent->flag, 1) == 1) node->flag = setbit(node->flag, 1);
 
         if(node->font == NULL && parent->font != NULL)
@@ -4050 +4069 @@
                 if(setnodeattr(child, parent, screencalc) == 0 && screencalc == 0)
                 {
-                        struct skin* tmp = drawnodepart(NULL, node, child, 0);
+                        struct skin* tmp = drawnodepart(NULL, node, parent, child, 0);
                         drawnode(child, 1);
-                        drawnodepart(tmp, node, child, 1);
+                        drawnodepart(tmp, node, parent, child, 1);
+                        child->flag = clearbit(child->flag, 1);
                 }
                 child = child->next;
         }
+
+        if(screencalc == 0 || flag == 4) node->flag = clearbit(node->flag, 1);
 
         if(flag == 0 || flag == 2 || flag == 4)
@@ -4479 +4501 @@
         int ret = 1;
 
-        if(node != NULL)
+        if(node != NULL && node->bgcol != value)
         {
                 node->bgcol = value;
@@ -4493 +4515 @@
         int ret = 1;
 
-        if(node != NULL)
+        //TODO
+        if(node != NULL /*&& node->progresssize != value*/)
         {
                 node->progresssize = value;
@@ -4503 +4526 @@
 }
 
+int changebordersize(struct skin* node, uint8_t value)
+{
+        int ret = 1;
+
+        if(node != NULL && node->bordersize != value)
+        {
+                node->bordersize = value;
+                node->flag = setbit(node->flag, 1);
+                ret = 0;
+        }
+        
+        return ret;
+}
+
 #endif