Mercurial > mplayer.hg
comparison gui/win32/skinload.c @ 37049:e2c10942873b
Relocate code added in r36991.
Perform the changes after mp_msg() debug output
in order to not confuse the user.
The changes are only internal ones.
| author | ib |
|---|---|
| date | Wed, 09 Apr 2014 12:46:06 +0000 |
| parents | 40ad45360c8a |
| children | 84c93a60ead3 |
comparison
equal
deleted
inserted
replaced
| 37048:8132b4eef5dc | 37049:e2c10942873b |
|---|---|
| 391 mywidget->value = atof(findnextstring(temp, desc, &base)); | 391 mywidget->value = atof(findnextstring(temp, desc, &base)); |
| 392 mywidget->x = mywidget->wx = atoi(findnextstring(temp, desc, &base)); | 392 mywidget->x = mywidget->wx = atoi(findnextstring(temp, desc, &base)); |
| 393 mywidget->y = mywidget->wy = atoi(findnextstring(temp, desc, &base)); | 393 mywidget->y = mywidget->wy = atoi(findnextstring(temp, desc, &base)); |
| 394 mywidget->wwidth = atoi(findnextstring(temp, desc, &base)); | 394 mywidget->wwidth = atoi(findnextstring(temp, desc, &base)); |
| 395 mywidget->wheight = atoi(findnextstring(temp, desc, &base)); | 395 mywidget->wheight = atoi(findnextstring(temp, desc, &base)); |
| 396 if (mywidget->bitmap[0] == NULL || mywidget->width == 0 || mywidget->height == 0) | |
| 397 { | |
| 398 mywidget->bitmap[0] = mywidget->bitmap[1]; | |
| 399 mywidget->width = mywidget->wwidth; | |
| 400 mywidget->height = mywidget->wheight; | |
| 401 } | |
| 402 findnextstring(temp, desc, &base); | 396 findnextstring(temp, desc, &base); |
| 403 mywidget->msg = evNone; | 397 mywidget->msg = evNone; |
| 404 for (i=0; i<evBoxs; i++) | 398 for (i=0; i<evBoxs; i++) |
| 405 { | 399 { |
| 406 if(!strcmp(temp, evNames[i].name)) | 400 if(!strcmp(temp, evNames[i].name)) |
| 418 mywidget->width, mywidget->height, | 412 mywidget->width, mywidget->height, |
| 419 (mywidget->bitmap[1]) ? mywidget->bitmap[1]->name : NULL, | 413 (mywidget->bitmap[1]) ? mywidget->bitmap[1]->name : NULL, |
| 420 mywidget->phases, mywidget->value, | 414 mywidget->phases, mywidget->value, |
| 421 mywidget->wx, mywidget->wy, mywidget->wwidth, mywidget->wwidth, | 415 mywidget->wx, mywidget->wy, mywidget->wwidth, mywidget->wwidth, |
| 422 mywidget->msg); | 416 mywidget->msg); |
| 417 if (mywidget->bitmap[0] == NULL || mywidget->width == 0 || mywidget->height == 0) | |
| 418 { | |
| 419 mywidget->bitmap[0] = mywidget->bitmap[1]; | |
| 420 mywidget->width = mywidget->wwidth; | |
| 421 mywidget->height = mywidget->wheight; | |
| 422 } | |
| 423 } | 423 } |
| 424 else if(!strncmp(desc, "pimage", 6)) | 424 else if(!strncmp(desc, "pimage", 6)) |
| 425 { | 425 { |
| 426 int base = counttonextchar(desc, '=') + 1; | 426 int base = counttonextchar(desc, '=') + 1; |
| 427 int i; | 427 int i; |