CSPublic/Blocks3D
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Changed icons, added Todo, fixed location of icons in properties combo box

Browse Source
This commit is contained in:
andreja6
2019-11-03 23:23:34 -08:00
parent 552be1ec54
commit 7898df7a8e
8 changed files with 151 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

278
DataModelInstance.cpp
View File

@@ -27,7 +27,7 @@ DataModelInstance::DataModelInstance(void)
workspace->setParent(this);
level->setParent(this);
_loadedFileName="..//skooter.rbxm";
listicon = 1;
listicon = 5;
}
@@ -91,149 +91,149 @@ Color3 bcToRGB(short bc)
{
switch(bc)
{
case 1: return Color3(0.94901967048645,0.95294123888016,0.95294123888016);
case 2: return Color3(0.63137257099152,0.64705884456635,0.63529413938522);
case 3: return Color3(0.9764706492424,0.91372555494308,0.60000002384186);
case 5: return Color3(0.84313732385635,0.77254909276962,0.60392159223557);
case 6: return Color3(0.7607843875885,0.85490202903748,0.72156864404678);
case 9: return Color3(0.90980398654938,0.7294117808342,0.78431379795074);
case 11: return Color3(0.50196081399918,0.73333334922791,0.85882359743118);
case 12: return Color3(0.79607850313187,0.51764708757401,0.258823543787);
case 18: return Color3(0.80000007152557,0.55686277151108,0.41176474094391);
case 21: return Color3(0.76862752437592,0.15686275064945,0.10980392992496);
case 22: return Color3(0.76862752437592,0.43921571969986,0.62745100259781);
case 23: return Color3(0.050980396568775,0.41176474094391,0.6745098233223);
case 24: return Color3(0.96078437566757,0.80392163991928,0.18823531270027);
case 25: return Color3(0.38431376218796,0.27843138575554,0.19607844948769);
case 26: return Color3(0.10588236153126,0.16470588743687,0.20784315466881);
case 27: return Color3(0.42745101451874,0.43137258291245,0.42352944612503);
case 28: return Color3(0.15686275064945,0.49803924560547,0.27843138575554);
case 29: return Color3(0.63137257099152,0.76862752437592,0.54901963472366);
case 36: return Color3(0.95294123888016,0.8117647767067,0.60784316062927);
case 37: return Color3(0.29411765933037,0.59215688705444,0.29411765933037);
case 38: return Color3(0.62745100259781,0.37254902720451,0.20784315466881);
case 39: return Color3(0.75686281919479,0.79215693473816,0.8705883026123);
case 40: return Color3(0.92549026012421,0.92549026012421,0.92549026012421);
case 41: return Color3(0.80392163991928,0.32941177487373,0.29411765933037);
case 42: return Color3(0.75686281919479,0.87450987100601,0.94117653369904);
case 43: return Color3(0.48235297203064,0.71372550725937,0.90980398654938);
case 44: return Color3(0.96862751245499,0.94509810209274,0.55294120311737);
case 45: return Color3(0.70588237047195,0.82352948188782,0.89411771297455);
case 47: return Color3(0.85098046064377,0.52156865596771,0.42352944612503);
case 48: return Color3(0.51764708757401,0.71372550725937,0.55294120311737);
case 49: return Color3(0.97254908084869,0.94509810209274,0.51764708757401);
case 50: return Color3(0.92549026012421,0.90980398654938,0.8705883026123);
case 100: return Color3(0.93333339691162,0.76862752437592,0.71372550725937);
case 101: return Color3(0.85490202903748,0.52549022436142,0.47843140363693);
case 102: return Color3(0.43137258291245,0.60000002384186,0.79215693473816);
case 103: return Color3(0.78039222955704,0.75686281919479,0.71764707565308);
case 104: return Color3(0.41960787773132,0.19607844948769,0.48627454042435);
case 105: return Color3(0.88627457618713,0.60784316062927,0.25098040699959);
case 106: return Color3(0.85490202903748,0.52156865596771,0.2549019753933);
case 107: return Color3(0,0.56078433990479,0.61176472902298);
case 108: return Color3(0.4078431725502,0.36078432202339,0.26274511218071);
case 110: return Color3(0.26274511218071,0.32941177487373,0.57647061347961);
case 111: return Color3(0.74901962280273,0.71764707565308,0.69411766529083);
case 112: return Color3(0.4078431725502,0.45490199327469,0.6745098233223);
case 113: return Color3(0.89411771297455,0.678431391716,0.78431379795074);
case 115: return Color3(0.78039222955704,0.82352948188782,0.23529413342476);
case 116: return Color3(0.33333334326744,0.64705884456635,0.68627452850342);
case 118: return Color3(0.71764707565308,0.84313732385635,0.83529418706894);
case 119: return Color3(0.64313727617264,0.74117648601532,0.27843138575554);
case 120: return Color3(0.85098046064377,0.89411771297455,0.65490198135376);
case 121: return Color3(0.90588241815567,0.6745098233223,0.34509804844856);
case 123: return Color3(0.82745105028152,0.43529415130615,0.29803922772408);
case 124: return Color3(0.57254904508591,0.22352942824364,0.47058826684952);
case 125: return Color3(0.91764712333679,0.72156864404678,0.57254904508591);
case 126: return Color3(0.64705884456635,0.64705884456635,0.79607850313187);
case 127: return Color3(0.86274516582489,0.73725491762161,0.50588238239288);
case 128: return Color3(0.68235296010971,0.47843140363693,0.34901961684227);
case 131: return Color3(0.61176472902298,0.63921570777893,0.65882354974747);
case 133: return Color3(0.83529418706894,0.45098042488098,0.23921570181847);
case 134: return Color3(0.84705889225006,0.8666667342186,0.33725491166115);
case 135: return Color3(0.45490199327469,0.52549022436142,0.61568629741669);
case 136: return Color3(0.52941179275513,0.48627454042435,0.56470590829849);
case 137: return Color3(0.87843143939972,0.59607845544815,0.39215689897537);
case 138: return Color3(0.58431375026703,0.54117649793625,0.45098042488098);
case 140: return Color3(0.12549020349979,0.22745099663734,0.33725491166115);
case 141: return Color3(0.15294118225574,0.27450981736183,0.17647059261799);
case 143: return Color3(0.8117647767067,0.88627457618713,0.96862751245499);
case 145: return Color3(0.47450983524323,0.53333336114883,0.63137257099152);
case 146: return Color3(0.58431375026703,0.55686277151108,0.63921570777893);
case 147: return Color3(0.57647061347961,0.52941179275513,0.40392160415649);
case 148: return Color3(0.34117648005486,0.34509804844856,0.34117648005486);
case 149: return Color3(0.086274512112141,0.11372549831867,0.19607844948769);
case 150: return Color3(0.67058825492859,0.678431391716,0.6745098233223);
case 151: return Color3(0.47058826684952,0.56470590829849,0.50980395078659);
case 153: return Color3(0.58431375026703,0.47450983524323,0.46666669845581);
case 154: return Color3(0.48235297203064,0.1803921610117,0.1843137294054);
case 157: return Color3(1,0.96470594406128,0.48235297203064);
case 158: return Color3(0.88235300779343,0.64313727617264,0.7607843875885);
case 168: return Color3(0.4588235616684,0.42352944612503,0.38431376218796);
case 176: return Color3(0.59215688705444,0.41176474094391,0.35686275362968);
case 178: return Color3(0.70588237047195,0.51764708757401,0.33333334326744);
case 179: return Color3(0.53725492954254,0.52941179275513,0.53333336114883);
case 180: return Color3(0.84313732385635,0.66274511814117,0.29411765933037);
case 190: return Color3(0.9764706492424,0.83921575546265,0.1803921610117);
case 191: return Color3(0.90980398654938,0.67058825492859,0.17647059261799);
case 192: return Color3(0.41176474094391,0.25098040699959,0.15686275064945);
case 193: return Color3(0.8117647767067,0.37647062540054,0.14117647707462);
case 195: return Color3(0.27450981736183,0.40392160415649,0.64313727617264);
case 196: return Color3(0.13725490868092,0.27843138575554,0.54509806632996);
case 198: return Color3(0.55686277151108,0.258823543787,0.52156865596771);
case 199: return Color3(0.38823533058167,0.37254902720451,0.38431376218796);
case 200: return Color3(0.50980395078659,0.54117649793625,0.3647058904171);
case 208: return Color3(0.89803928136826,0.89411771297455,0.87450987100601);
case 209: return Color3(0.69019609689713,0.55686277151108,0.26666668057442);
case 210: return Color3(0.43921571969986,0.58431375026703,0.47058826684952);
case 211: return Color3(0.47450983524323,0.70980393886566,0.70980393886566);
case 212: return Color3(0.6235294342041,0.76470595598221,0.91372555494308);
case 213: return Color3(0.42352944612503,0.50588238239288,0.71764707565308);
case 216: return Color3(0.56078433990479,0.29803922772408,0.16470588743687);
case 217: return Color3(0.48627454042435,0.36078432202339,0.27450981736183);
case 218: return Color3(0.58823531866074,0.43921571969986,0.6235294342041);
case 219: return Color3(0.41960787773132,0.38431376218796,0.60784316062927);
case 220: return Color3(0.65490198135376,0.66274511814117,0.80784320831299);
case 221: return Color3(0.80392163991928,0.38431376218796,0.59607845544815);
case 222: return Color3(0.89411771297455,0.678431391716,0.78431379795074);
case 223: return Color3(0.86274516582489,0.56470590829849,0.58431375026703);
case 224: return Color3(0.94117653369904,0.83529418706894,0.62745100259781);
case 225: return Color3(0.9215686917305,0.72156864404678,0.49803924560547);
case 226: return Color3(0.99215692281723,0.91764712333679,0.55294120311737);
case 232: return Color3(0.49019610881805,0.73333334922791,0.8666667342186);
case 268: return Color3(0.2039215862751,0.16862745583057,0.4588235616684);
case 1001: return Color3(0.97254908084869,0.97254908084869,0.97254908084869);
case 1002: return Color3(0.80392163991928,0.80392163991928,0.80392163991928);
case 1003: return Color3(0.066666670143604,0.066666670143604,0.066666670143604);
case 1: return Color3(0.94901967048645F,0.95294123888016,0.95294123888016);
case 2: return Color3(0.63137257099152F,0.64705884456635,0.63529413938522);
case 3: return Color3(0.9764706492424F,0.91372555494308,0.60000002384186);
case 5: return Color3(0.84313732385635F,0.77254909276962,0.60392159223557);
case 6: return Color3(0.7607843875885F,0.85490202903748,0.72156864404678);
case 9: return Color3(0.90980398654938F,0.7294117808342,0.78431379795074);
case 11: return Color3(0.50196081399918F,0.73333334922791,0.85882359743118);
case 12: return Color3(0.79607850313187F,0.51764708757401,0.258823543787);
case 18: return Color3(0.80000007152557F,0.55686277151108,0.41176474094391);
case 21: return Color3(0.76862752437592F,0.15686275064945,0.10980392992496);
case 22: return Color3(0.76862752437592F,0.43921571969986,0.62745100259781);
case 23: return Color3(0.050980396568775F,0.41176474094391,0.6745098233223);
case 24: return Color3(0.96078437566757F,0.80392163991928,0.18823531270027);
case 25: return Color3(0.38431376218796F,0.27843138575554,0.19607844948769);
case 26: return Color3(0.10588236153126F,0.16470588743687,0.20784315466881);
case 27: return Color3(0.42745101451874F,0.43137258291245,0.42352944612503);
case 28: return Color3(0.15686275064945F,0.49803924560547,0.27843138575554);
case 29: return Color3(0.63137257099152F,0.76862752437592,0.54901963472366);
case 36: return Color3(0.95294123888016F,0.8117647767067,0.60784316062927);
case 37: return Color3(0.29411765933037F,0.59215688705444,0.29411765933037);
case 38: return Color3(0.62745100259781F,0.37254902720451,0.20784315466881);
case 39: return Color3(0.75686281919479F,0.79215693473816,0.8705883026123);
case 40: return Color3(0.92549026012421F,0.92549026012421,0.92549026012421);
case 41: return Color3(0.80392163991928F,0.32941177487373,0.29411765933037);
case 42: return Color3(0.75686281919479F,0.87450987100601,0.94117653369904);
case 43: return Color3(0.48235297203064F,0.71372550725937,0.90980398654938);
case 44: return Color3(0.96862751245499F,0.94509810209274,0.55294120311737);
case 45: return Color3(0.70588237047195F,0.82352948188782,0.89411771297455);
case 47: return Color3(0.85098046064377F,0.52156865596771,0.42352944612503);
case 48: return Color3(0.51764708757401F,0.71372550725937,0.55294120311737);
case 49: return Color3(0.97254908084869F,0.94509810209274,0.51764708757401);
case 50: return Color3(0.92549026012421F,0.90980398654938,0.8705883026123);
case 100: return Color3(0.93333339691162F,0.76862752437592,0.71372550725937);
case 101: return Color3(0.85490202903748F,0.52549022436142,0.47843140363693);
case 102: return Color3(0.43137258291245F,0.60000002384186,0.79215693473816);
case 103: return Color3(0.78039222955704F,0.75686281919479,0.71764707565308);
case 104: return Color3(0.41960787773132F,0.19607844948769,0.48627454042435);
case 105: return Color3(0.88627457618713F,0.60784316062927,0.25098040699959);
case 106: return Color3(0.85490202903748F,0.52156865596771,0.2549019753933);
case 107: return Color3(0,0.56078433990479F,0.61176472902298);
case 108: return Color3(0.4078431725502F,0.36078432202339,0.26274511218071);
case 110: return Color3(0.26274511218071F,0.32941177487373,0.57647061347961);
case 111: return Color3(0.74901962280273F,0.71764707565308,0.69411766529083);
case 112: return Color3(0.4078431725502F,0.45490199327469,0.6745098233223);
case 113: return Color3(0.89411771297455F,0.678431391716,0.78431379795074);
case 115: return Color3(0.78039222955704F,0.82352948188782,0.23529413342476);
case 116: return Color3(0.33333334326744F,0.64705884456635,0.68627452850342);
case 118: return Color3(0.71764707565308F,0.84313732385635,0.83529418706894);
case 119: return Color3(0.64313727617264F,0.74117648601532,0.27843138575554);
case 120: return Color3(0.85098046064377F,0.89411771297455,0.65490198135376);
case 121: return Color3(0.90588241815567F,0.6745098233223,0.34509804844856);
case 123: return Color3(0.82745105028152F,0.43529415130615,0.29803922772408);
case 124: return Color3(0.57254904508591F,0.22352942824364,0.47058826684952);
case 125: return Color3(0.91764712333679F,0.72156864404678,0.57254904508591);
case 126: return Color3(0.64705884456635F,0.64705884456635,0.79607850313187);
case 127: return Color3(0.86274516582489F,0.73725491762161,0.50588238239288);
case 128: return Color3(0.68235296010971F,0.47843140363693,0.34901961684227);
case 131: return Color3(0.61176472902298F,0.63921570777893,0.65882354974747);
case 133: return Color3(0.83529418706894F,0.45098042488098,0.23921570181847);
case 134: return Color3(0.84705889225006F,0.8666667342186,0.33725491166115);
case 135: return Color3(0.45490199327469F,0.52549022436142,0.61568629741669);
case 136: return Color3(0.52941179275513F,0.48627454042435,0.56470590829849);
case 137: return Color3(0.87843143939972F,0.59607845544815,0.39215689897537);
case 138: return Color3(0.58431375026703F,0.54117649793625,0.45098042488098);
case 140: return Color3(0.12549020349979F,0.22745099663734,0.33725491166115);
case 141: return Color3(0.15294118225574F,0.27450981736183,0.17647059261799);
case 143: return Color3(0.8117647767067F,0.88627457618713,0.96862751245499);
case 145: return Color3(0.47450983524323F,0.53333336114883,0.63137257099152);
case 146: return Color3(0.58431375026703F,0.55686277151108,0.63921570777893);
case 147: return Color3(0.57647061347961F,0.52941179275513,0.40392160415649);
case 148: return Color3(0.34117648005486F,0.34509804844856,0.34117648005486);
case 149: return Color3(0.086274512112141F,0.11372549831867,0.19607844948769);
case 150: return Color3(0.67058825492859F,0.678431391716,0.6745098233223);
case 151: return Color3(0.47058826684952F,0.56470590829849,0.50980395078659);
case 153: return Color3(0.58431375026703F,0.47450983524323,0.46666669845581);
case 154: return Color3(0.48235297203064F,0.1803921610117,0.1843137294054);
case 157: return Color3(1,0.96470594406128F,0.48235297203064);
case 158: return Color3(0.88235300779343F,0.64313727617264,0.7607843875885);
case 168: return Color3(0.4588235616684F,0.42352944612503,0.38431376218796);
case 176: return Color3(0.59215688705444F,0.41176474094391,0.35686275362968);
case 178: return Color3(0.70588237047195F,0.51764708757401,0.33333334326744);
case 179: return Color3(0.53725492954254F,0.52941179275513,0.53333336114883);
case 180: return Color3(0.84313732385635F,0.66274511814117,0.29411765933037);
case 190: return Color3(0.9764706492424F,0.83921575546265,0.1803921610117);
case 191: return Color3(0.90980398654938F,0.67058825492859,0.17647059261799);
case 192: return Color3(0.41176474094391F,0.25098040699959,0.15686275064945);
case 193: return Color3(0.8117647767067F,0.37647062540054,0.14117647707462);
case 195: return Color3(0.27450981736183F,0.40392160415649,0.64313727617264);
case 196: return Color3(0.13725490868092F,0.27843138575554,0.54509806632996);
case 198: return Color3(0.55686277151108F,0.258823543787,0.52156865596771);
case 199: return Color3(0.38823533058167F,0.37254902720451,0.38431376218796);
case 200: return Color3(0.50980395078659F,0.54117649793625,0.3647058904171);
case 208: return Color3(0.89803928136826F,0.89411771297455,0.87450987100601);
case 209: return Color3(0.69019609689713F,0.55686277151108,0.26666668057442);
case 210: return Color3(0.43921571969986F,0.58431375026703,0.47058826684952);
case 211: return Color3(0.47450983524323F,0.70980393886566,0.70980393886566);
case 212: return Color3(0.6235294342041F,0.76470595598221,0.91372555494308);
case 213: return Color3(0.42352944612503F,0.50588238239288,0.71764707565308);
case 216: return Color3(0.56078433990479F,0.29803922772408,0.16470588743687);
case 217: return Color3(0.48627454042435F,0.36078432202339,0.27450981736183);
case 218: return Color3(0.58823531866074F,0.43921571969986,0.6235294342041);
case 219: return Color3(0.41960787773132F,0.38431376218796,0.60784316062927);
case 220: return Color3(0.65490198135376F,0.66274511814117,0.80784320831299);
case 221: return Color3(0.80392163991928F,0.38431376218796,0.59607845544815);
case 222: return Color3(0.89411771297455F,0.678431391716,0.78431379795074);
case 223: return Color3(0.86274516582489F,0.56470590829849,0.58431375026703);
case 224: return Color3(0.94117653369904F,0.83529418706894,0.62745100259781);
case 225: return Color3(0.9215686917305F,0.72156864404678,0.49803924560547);
case 226: return Color3(0.99215692281723F,0.91764712333679,0.55294120311737);
case 232: return Color3(0.49019610881805F,0.73333334922791,0.8666667342186);
case 268: return Color3(0.2039215862751F,0.16862745583057,0.4588235616684);
case 1001: return Color3(0.97254908084869F,0.97254908084869,0.97254908084869);
case 1002: return Color3(0.80392163991928F,0.80392163991928,0.80392163991928);
case 1003: return Color3(0.066666670143604F,0.066666670143604,0.066666670143604);
case 1004: return Color3(1,0,0);
case 1005: return Color3(1,0.68627452850342,0);
case 1006: return Color3(0.70588237047195,0.50196081399918,1);
case 1007: return Color3(0.63921570777893,0.29411765933037,0.29411765933037);
case 1008: return Color3(0.75686281919479,0.74509805440903,0.258823543787);
case 1005: return Color3(1,0.68627452850342F,0);
case 1006: return Color3(0.70588237047195F,0.50196081399918,1);
case 1007: return Color3(0.63921570777893F,0.29411765933037,0.29411765933037);
case 1008: return Color3(0.75686281919479F,0.74509805440903,0.258823543787);
case 1009: return Color3(1,1,0);
case 1010: return Color3(0,0,1);
case 1011: return Color3(0,0.12549020349979,0.37647062540054);
case 1012: return Color3(0.1294117718935,0.32941177487373,0.72549021244049);
case 1013: return Color3(0.015686275437474,0.68627452850342,0.92549026012421);
case 1014: return Color3(0.66666668653488,0.33333334326744,0);
case 1015: return Color3(0.66666668653488,0,0.66666668653488);
case 1016: return Color3(1,0.40000003576279,0.80000007152557);
case 1017: return Color3(1,0.68627452850342,0);
case 1018: return Color3(0.070588238537312,0.93333339691162,0.83137261867523);
case 1011: return Color3(0,0.12549020349979F,0.37647062540054);
case 1012: return Color3(0.1294117718935F,0.32941177487373,0.72549021244049);
case 1013: return Color3(0.015686275437474F,0.68627452850342,0.92549026012421);
case 1014: return Color3(0.66666668653488F,0.33333334326744,0);
case 1015: return Color3(0.66666668653488F,0,0.66666668653488);
case 1016: return Color3(1,0.40000003576279F,0.80000007152557);
case 1017: return Color3(1,0.68627452850342F,0);
case 1018: return Color3(0.070588238537312F,0.93333339691162,0.83137261867523);
case 1019: return Color3(0,1,1);
case 1020: return Color3(0,1,0);
case 1021: return Color3(0.22745099663734,0.49019610881805,0.082352943718433);
case 1022: return Color3(0.49803924560547,0.55686277151108,0.39215689897537);
case 1023: return Color3(0.54901963472366,0.35686275362968,0.6235294342041);
case 1024: return Color3(0.68627452850342,0.8666667342186,1);
case 1025: return Color3(1,0.78823536634445,0.78823536634445);
case 1026: return Color3(0.69411766529083,0.65490198135376,1);
case 1027: return Color3(0.6235294342041,0.95294123888016,0.91372555494308);
case 1028: return Color3(0.80000007152557,1,0.80000007152557);
case 1029: return Color3(1,1,0.80000007152557);
case 1030: return Color3(1,0.80000007152557,0.60000002384186);
case 1031: return Color3(0.38431376218796,0.14509804546833,0.81960791349411);
case 1032: return Color3(1,0,0.74901962280273);
case 1021: return Color3(0.22745099663734F,0.49019610881805,0.082352943718433);
case 1022: return Color3(0.49803924560547F,0.55686277151108,0.39215689897537);
case 1023: return Color3(0.54901963472366F,0.35686275362968,0.6235294342041);
case 1024: return Color3(0.68627452850342F,0.8666667342186,1);
case 1025: return Color3(1,0.78823536634445F,0.78823536634445);
case 1026: return Color3(0.69411766529083F,0.65490198135376,1);
case 1027: return Color3(0.6235294342041F,0.95294123888016,0.91372555494308);
case 1028: return Color3(0.80000007152557F,1,0.80000007152557);
case 1029: return Color3(1,1,0.80000007152557F);
case 1030: return Color3(1,0.80000007152557F,0.60000002384186F);
case 1031: return Color3(0.38431376218796F,0.14509804546833F,0.81960791349411F);
case 1032: return Color3(1,0,0.74901962280273F);
default: return Color3::gray();
}
}

2
GroupInstance.cpp
View File

@@ -4,11 +4,13 @@ GroupInstance::GroupInstance(void)
{
PVInstance::PVInstance();
className = "GroupInstance";
listicon = 12;
}
GroupInstance::GroupInstance(const GroupInstance &oinst)
{
PVInstance::PVInstance(oinst);
listicon = 12;
}
GroupInstance::~GroupInstance(void)

2
Instance.cpp
View File

@@ -8,7 +8,7 @@ Instance::Instance(void)
parent = NULL;
name = "Default Game Instance";
className = "BaseInstance";
listicon = 0;
listicon = 1;
canDelete = true;
}

1
PVInstance.cpp
View File

@@ -5,6 +5,7 @@ PVInstance::PVInstance(void)
Instance::Instance();
nameShown = false;
className = "PVInstance";
listicon = 0;
}
PVInstance::PVInstance(const PVInstance &oinst)

BIN
Parts.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 11 KiB

4
PropertyWindow.cpp
View File

@@ -141,11 +141,11 @@ LRESULT CALLBACK PropProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
break;
SelectObject(hdc, hbmMask);
BitBlt(lpdis->hDC, x, lpdis->rcItem.top + 1,
BitBlt(lpdis->hDC, x, lpdis->rcItem.top,
CX_BITMAP, CY_BITMAP, hdc, mul*16, 0, SRCAND);
SelectObject(hdc, hbmIcon);
BitBlt(lpdis->hDC, x, lpdis->rcItem.top + 1,
BitBlt(lpdis->hDC, x, lpdis->rcItem.top,
CX_BITMAP, CY_BITMAP, hdc, mul*16, 0, SRCPAINT);
DeleteDC(hdc);

1
WorkspaceInstance.cpp
View File

@@ -7,7 +7,6 @@ WorkspaceInstance::WorkspaceInstance(void)
name = "Workspace";
className = "Workspace";
canDelete = false;
listicon = 8;
}
WorkspaceInstance::~WorkspaceInstance(void)

11
main.cpp
View File

@@ -926,20 +926,20 @@ BOOL GetKPBool(int VK) {
void Demo::onUserInput(UserInput* ui) {
/*
if(GetHoldKeyState(VK_LCONTROL))
/*if(GetHoldKeyState(VK_LCONTROL))
{
if(GetHoldKeyState('D'))
{
messageTime = System::time();
if(debugMode())
if()
message = "Debug Mode Disabled";
else
message = "Debug Mode Enabled";
setDebugMode(!debugMode());
}
}
*/
}*/
if(GetHoldKeyState(VK_F8))
{
messageTime = System::time();
@@ -1789,6 +1789,7 @@ int main(int argc, char** argv) {
}
catch(...)
{
//TODO Figure how to save the error to file
OnError(-1);
}
return 0;