diff --git a/art/textures/pin.png b/art/textures/pin.png new file mode 100644 index 00000000..a72407b2 Binary files /dev/null and b/art/textures/pin.png differ diff --git a/art/textures/sticky-note.9.png b/art/textures/sticky-note.9.png new file mode 100644 index 00000000..7d6b5214 Binary files /dev/null and b/art/textures/sticky-note.9.png differ diff --git a/assets/style/uiskin.atlas b/assets/style/uiskin.atlas index d3303a56..f809694a 100644 --- a/assets/style/uiskin.atlas +++ b/assets/style/uiskin.atlas @@ -6,7 +6,7 @@ filter: Nearest,Nearest repeat: none action-up rotate: false - xy: 524, 54 + xy: 829, 87 size: 15, 15 orig: 15, 15 offset: 0, 0 @@ -83,14 +83,14 @@ align-simple-up index: -1 animation-up rotate: false - xy: 616, 63 + xy: 652, 63 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 border rotate: false - xy: 777, 46 + xy: 867, 61 size: 5, 5 split: 2, 2, 2, 2 pad: 1, 1, 1, 1 @@ -99,21 +99,21 @@ border index: -1 border-circle rotate: false - xy: 752, 64 + xy: 754, 64 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 border-circle-error rotate: false - xy: 768, 64 + xy: 880, 86 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 border-error rotate: false - xy: 517, 22 + xy: 527, 22 size: 11, 11 split: 5, 5, 5, 5 pad: 1, 1, 1, 1 @@ -122,7 +122,7 @@ border-error index: -1 border-textfield rotate: false - xy: 764, 46 + xy: 580, 47 size: 11, 5 split: 5, 5, 2, 2 pad: 5, 5, 1, 1 @@ -131,21 +131,21 @@ border-textfield index: -1 box-colapse-off rotate: false - xy: 545, 2 + xy: 959, 79 size: 11, 11 orig: 11, 11 offset: 0, 0 index: -1 box-colapse-on rotate: false - xy: 558, 2 + xy: 770, 56 size: 11, 11 orig: 11, 11 offset: 0, 0 index: -1 button rotate: false - xy: 587, 15 + xy: 634, 23 size: 12, 20 split: 5, 5, 5, 4 pad: 5, 5, 2, 2 @@ -154,7 +154,7 @@ button index: -1 button-dark rotate: false - xy: 447, 5 + xy: 513, 13 size: 12, 20 split: 5, 5, 5, 4 pad: 4, 4, 3, 3 @@ -163,7 +163,7 @@ button-dark index: -1 button-dark-down rotate: false - xy: 497, 37 + xy: 564, 25 size: 12, 20 split: 5, 5, 5, 4 pad: 4, 4, 3, 3 @@ -172,7 +172,7 @@ button-dark-down index: -1 button-dark-over rotate: false - xy: 530, 32 + xy: 499, 13 size: 12, 20 split: 5, 5, 5, 4 pad: 4, 4, 4, 3 @@ -181,7 +181,7 @@ button-dark-over index: -1 button-down rotate: false - xy: 461, 10 + xy: 541, 5 size: 12, 20 split: 5, 5, 5, 4 pad: 5, 5, 2, 2 @@ -190,7 +190,7 @@ button-down index: -1 button-flat-red rotate: false - xy: 503, 13 + xy: 576, 3 size: 12, 20 split: 3, 3, 3, 4 orig: 12, 20 @@ -198,7 +198,7 @@ button-flat-red index: -1 button-flat-red-down rotate: false - xy: 475, 10 + xy: 562, 3 size: 12, 20 split: 3, 3, 3, 4 orig: 12, 20 @@ -206,7 +206,7 @@ button-flat-red-down index: -1 button-flat-red-over rotate: false - xy: 489, 10 + xy: 578, 25 size: 12, 20 split: 3, 3, 3, 4 orig: 12, 20 @@ -214,7 +214,7 @@ button-flat-red-over index: -1 button-over rotate: false - xy: 531, 10 + xy: 590, 3 size: 12, 20 split: 5, 5, 5, 4 pad: 5, 5, 2, 2 @@ -223,7 +223,7 @@ button-over index: -1 button-panel-bg rotate: false - xy: 545, 15 + xy: 592, 25 size: 12, 20 split: 5, 5, 5, 4 pad: 4, 4, 1, 1 @@ -232,7 +232,7 @@ button-panel-bg index: -1 button-red rotate: false - xy: 517, 2 + xy: 527, 2 size: 12, 18 split: 5, 5, 4, 3 pad: 4, 4, 1, 1 @@ -241,7 +241,7 @@ button-red index: -1 button-resource rotate: false - xy: 573, 15 + xy: 620, 23 size: 12, 20 split: 5, 5, 5, 4 pad: 4, 4, 1, 1 @@ -250,7 +250,7 @@ button-resource index: -1 button-resource-over rotate: false - xy: 559, 15 + xy: 606, 23 size: 12, 20 split: 5, 5, 5, 4 pad: 4, 4, 1, 1 @@ -259,7 +259,7 @@ button-resource-over index: -1 button-window-bg rotate: false - xy: 890, 82 + xy: 604, 3 size: 12, 18 split: 5, 5, 4, 3 pad: 4, 4, 1, 1 @@ -268,63 +268,63 @@ button-window-bg index: -1 close-node rotate: false - xy: 731, 49 + xy: 596, 47 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 close-node-hover rotate: false - xy: 852, 69 + xy: 975, 65 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 close-node-pressed rotate: false - xy: 866, 69 + xy: 989, 65 size: 12, 12 orig: 12, 12 offset: 0, 0 index: -1 color-picker-bar-selector rotate: false - xy: 880, 67 + xy: 626, 45 size: 7, 14 orig: 7, 14 offset: 0, 0 index: -1 color-picker-cross rotate: false - xy: 784, 47 + xy: 902, 63 size: 5, 5 orig: 5, 5 offset: 0, 0 index: -1 color-picker-selector-horizontal rotate: false - xy: 596, 37 + xy: 21, 2 size: 3, 1 orig: 3, 1 offset: 0, 0 index: -1 color-picker-selector-vertical rotate: false - xy: 794, 50 + xy: 577, 99 size: 1, 3 orig: 1, 3 offset: 0, 0 index: -1 cursor rotate: false - xy: 38, 2 + xy: 30, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 default-pane rotate: false - xy: 601, 28 + xy: 570, 99 size: 5, 3 split: 1, 1, 1, 1 orig: 5, 3 @@ -332,7 +332,7 @@ default-pane index: -1 default-pane-noborder rotate: false - xy: 41, 2 + xy: 33, 2 size: 1, 1 split: 0, 0, 0, 0 orig: 1, 1 @@ -340,7 +340,7 @@ default-pane-noborder index: -1 default-select rotate: false - xy: 866, 102 + xy: 914, 102 size: 27, 24 split: 4, 16, 0, 24 orig: 27, 24 @@ -348,7 +348,7 @@ default-select index: -1 default-select-over rotate: false - xy: 837, 102 + xy: 885, 102 size: 27, 24 split: 4, 16, 0, 24 orig: 27, 24 @@ -371,14 +371,14 @@ dropHere index: -1 expand-icon rotate: false - xy: 598, 62 + xy: 634, 62 size: 16, 16 orig: 16, 16 offset: 0, 0 index: -1 expandable-properties-active-bg rotate: false - xy: 758, 45 + xy: 868, 68 size: 4, 17 split: 1, 2, 0, 17 orig: 4, 17 @@ -386,21 +386,21 @@ expandable-properties-active-bg index: -1 expandable-properties-collapse-off rotate: false - xy: 800, 53 + xy: 849, 62 size: 7, 7 orig: 7, 7 offset: 0, 0 index: -1 expandable-properties-collapse-on rotate: false - xy: 809, 53 + xy: 858, 62 size: 7, 7 orig: 7, 7 offset: 0, 0 index: -1 expandable-properties-inactive-bg rotate: false - xy: 752, 44 + xy: 648, 25 size: 4, 18 split: 1, 2, 0, 18 orig: 4, 18 @@ -415,14 +415,14 @@ icon-animation index: -1 icon-arrow-left rotate: false - xy: 1016, 115 + xy: 783, 56 size: 6, 11 orig: 6, 11 offset: 0, 0 index: -1 icon-arrow-right rotate: false - xy: 1016, 102 + xy: 791, 56 size: 6, 11 orig: 6, 11 offset: 0, 0 @@ -443,7 +443,7 @@ icon-close-panel index: -1 icon-close-small rotate: false - xy: 889, 68 + xy: 1003, 65 size: 12, 12 orig: 12, 12 offset: 0, 0 @@ -464,7 +464,7 @@ icon-composite index: -1 icon-composite2 rotate: false - xy: 784, 64 + xy: 896, 86 size: 14, 14 orig: 14, 14 offset: 0, 0 @@ -513,259 +513,259 @@ icon-folder index: -1 icon-folder-new rotate: false - xy: 327, 3 + xy: 399, 3 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-folder-parent rotate: false - xy: 351, 3 + xy: 425, 27 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-folder-star rotate: false - xy: 375, 3 + xy: 423, 3 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-group rotate: false - xy: 399, 3 + xy: 447, 56 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-image rotate: false - xy: 425, 27 + xy: 471, 56 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-label rotate: false - xy: 423, 3 + xy: 449, 32 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-library rotate: false - xy: 447, 56 + xy: 473, 32 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-library-over rotate: false - xy: 471, 56 + xy: 497, 35 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-link-active rotate: false - xy: 633, 63 + xy: 846, 87 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 icon-link-inactive rotate: false - xy: 650, 63 + xy: 669, 63 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 icon-list-settings rotate: false - xy: 449, 32 + xy: 540, 75 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-lock-active rotate: false - xy: 473, 32 + xy: 540, 51 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-lock-inactive rotate: false - xy: 540, 80 + xy: 972, 79 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-new-layer rotate: false - xy: 904, 86 + xy: 928, 85 size: 13, 15 orig: 13, 15 offset: 0, 0 index: -1 icon-particle rotate: false - xy: 564, 80 + xy: 996, 79 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-particle-over rotate: false - xy: 588, 80 + xy: 540, 27 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-particle-white rotate: false - xy: 612, 80 + xy: 580, 80 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-refresh rotate: false - xy: 636, 80 + xy: 604, 80 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-root rotate: false - xy: 800, 62 + xy: 912, 86 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 icon-spine rotate: false - xy: 660, 80 + xy: 628, 80 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-star rotate: false - xy: 684, 80 + xy: 652, 80 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-star-outline rotate: false - xy: 708, 80 + xy: 676, 80 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-trash rotate: false - xy: 919, 86 + xy: 635, 45 size: 13, 15 orig: 13, 15 offset: 0, 0 index: -1 icon-trash-disabled rotate: false - xy: 934, 86 + xy: 625, 6 size: 13, 15 orig: 13, 15 offset: 0, 0 index: -1 icon-trash-over rotate: false - xy: 949, 86 + xy: 640, 6 size: 13, 15 orig: 13, 15 offset: 0, 0 index: -1 icon-unlink-active rotate: false - xy: 667, 63 + xy: 863, 87 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 icon-unlink-inactive rotate: false - xy: 684, 63 + xy: 686, 63 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 icon-visible-off rotate: false - xy: 732, 80 + xy: 700, 80 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-visible-on rotate: false - xy: 756, 80 + xy: 724, 80 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 icon-zoomin rotate: false - xy: 852, 83 + xy: 521, 35 size: 17, 17 orig: 17, 17 offset: 0, 0 index: -1 icon-zoomin-disabled rotate: false - xy: 871, 83 + xy: 772, 85 size: 17, 17 orig: 17, 17 offset: 0, 0 index: -1 icon-zoomin-over rotate: false - xy: 511, 35 + xy: 596, 61 size: 17, 17 orig: 17, 17 offset: 0, 0 index: -1 icon-zoomout rotate: false - xy: 541, 61 + xy: 791, 85 size: 17, 17 orig: 17, 17 offset: 0, 0 index: -1 icon-zoomout-disabled rotate: false - xy: 560, 61 + xy: 615, 61 size: 17, 17 orig: 17, 17 offset: 0, 0 index: -1 icon-zoomout-over rotate: false - xy: 579, 61 + xy: 810, 85 size: 17, 17 orig: 17, 17 offset: 0, 0 index: -1 image-up rotate: false - xy: 701, 63 + xy: 703, 63 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 layer-bg rotate: false - xy: 745, 42 + xy: 618, 2 size: 5, 19 split: 2, 2, 0, 19 orig: 5, 19 @@ -773,7 +773,7 @@ layer-bg index: -1 layer-bg-over rotate: false - xy: 596, 40 + xy: 555, 6 size: 5, 19 split: 2, 2, 0, 19 orig: 5, 19 @@ -781,28 +781,28 @@ layer-bg-over index: -1 library-up rotate: false - xy: 718, 63 + xy: 720, 63 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 list-selection rotate: false - xy: 44, 2 + xy: 36, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 list-selection-white rotate: false - xy: 47, 2 + xy: 39, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 logo rotate: false - xy: 895, 103 + xy: 972, 103 size: 23, 23 orig: 23, 23 offset: 0, 0 @@ -817,7 +817,7 @@ menu-bg index: -1 menu-bg-down rotate: false - xy: 804, 78 + xy: 564, 73 size: 14, 24 split: 2, 2, 0, 24 orig: 14, 24 @@ -825,7 +825,7 @@ menu-bg-down index: -1 menu-bg-over rotate: false - xy: 820, 78 + xy: 564, 47 size: 14, 24 split: 2, 2, 0, 24 orig: 14, 24 @@ -833,7 +833,7 @@ menu-bg-over index: -1 menu-bg-up rotate: false - xy: 836, 76 + xy: 580, 54 size: 14, 24 split: 2, 2, 0, 24 orig: 14, 24 @@ -841,14 +841,14 @@ menu-bg-up index: -1 origin-anchor rotate: false - xy: 503, 2 + xy: 499, 2 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 padded-list-selection rotate: false - xy: 449, 27 + xy: 874, 65 size: 10, 3 split: 4, 4, 1, 1 pad: 4, 4, 0, 0 @@ -857,7 +857,7 @@ padded-list-selection index: -1 panel rotate: false - xy: 511, 54 + xy: 527, 54 size: 11, 36 split: 3, 3, 33, 2 orig: 11, 36 @@ -865,14 +865,21 @@ panel index: -1 particle-up rotate: false - xy: 735, 63 + xy: 737, 63 size: 15, 15 orig: 15, 15 offset: 0, 0 index: -1 +pin + rotate: false + xy: 493, 92 + size: 36, 34 + orig: 36, 34 + offset: 0, 0 + index: -1 popup-menu rotate: false - xy: 601, 23 + xy: 494, 3 size: 3, 3 split: 1, 1, 1, 1 orig: 3, 3 @@ -880,7 +887,7 @@ popup-menu index: -1 popup-menu-disabled rotate: false - xy: 497, 32 + xy: 521, 54 size: 3, 3 split: 1, 1, 1, 1 orig: 3, 3 @@ -888,7 +895,7 @@ popup-menu-disabled index: -1 popup-menu-down rotate: false - xy: 613, 41 + xy: 449, 27 size: 3, 3 split: 1, 1, 1, 1 orig: 3, 3 @@ -896,7 +903,7 @@ popup-menu-down index: -1 popup-menu-over rotate: false - xy: 608, 35 + xy: 938, 80 size: 3, 3 split: 1, 1, 1, 1 orig: 3, 3 @@ -904,14 +911,14 @@ popup-menu-over index: -1 progressbar rotate: false - xy: 541, 54 + xy: 593, 47 size: 1, 5 orig: 1, 5 offset: 0, 0 index: -1 progressbar-filled rotate: false - xy: 514, 6 + xy: 1021, 121 size: 1, 5 orig: 1, 5 offset: 0, 0 @@ -925,14 +932,14 @@ progressbar-filled-vertical index: -1 progressbar-vertical rotate: false - xy: 9, 2 + xy: 541, 2 size: 5, 1 orig: 5, 1 offset: 0, 0 index: -1 scroll rotate: false - xy: 468, 2 + xy: 1017, 63 size: 5, 6 split: 2, 2, 2, 2 orig: 5, 6 @@ -940,7 +947,7 @@ scroll index: -1 scroll-horizontal rotate: false - xy: 475, 3 + xy: 531, 92 size: 6, 5 split: 2, 2, 0, 5 pad: -1, -1, 2, 2 @@ -949,7 +956,7 @@ scroll-horizontal index: -1 scroll-knob-horizontal rotate: false - xy: 818, 55 + xy: 886, 63 size: 6, 5 split: 2, 2, 0, 5 pad: -1, -1, 2, 2 @@ -958,7 +965,7 @@ scroll-knob-horizontal index: -1 scroll-knob-vertical rotate: false - xy: 461, 2 + xy: 1017, 71 size: 5, 6 split: 2, 2, 2, 2 orig: 5, 6 @@ -966,105 +973,105 @@ scroll-knob-vertical index: -1 select-box-list-bg rotate: false - xy: 50, 2 + xy: 42, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 select-box-list-bg-white rotate: false - xy: 53, 2 + xy: 45, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 select-down rotate: false - xy: 483, 4 + xy: 470, 2 size: 7, 4 orig: 7, 4 offset: 0, 0 index: -1 select-up rotate: false - xy: 492, 4 + xy: 479, 2 size: 7, 4 orig: 7, 4 offset: 0, 0 index: -1 selection rotate: false - xy: 56, 2 + xy: 48, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 selection-anchor rotate: false - xy: 571, 4 + xy: 510, 2 size: 9, 9 orig: 9, 9 offset: 0, 0 index: -1 separator rotate: false - xy: 514, 2 + xy: 625, 2 size: 1, 2 orig: 1, 2 offset: 0, 0 index: -1 separator-menu rotate: false - xy: 514, 2 + xy: 625, 2 size: 1, 2 orig: 1, 2 offset: 0, 0 index: -1 separator-vertical rotate: false - xy: 34, 2 + xy: 26, 2 size: 2, 1 orig: 2, 1 offset: 0, 0 index: -1 slider rotate: false - xy: 1012, 97 + xy: 1021, 115 size: 1, 4 orig: 1, 4 offset: 0, 0 index: -1 slider-knob rotate: false - xy: 544, 37 + xy: 447, 3 size: 11, 22 orig: 11, 22 offset: 0, 0 index: -1 slider-knob-disabled rotate: false - xy: 557, 37 + xy: 460, 8 size: 11, 22 orig: 11, 22 offset: 0, 0 index: -1 slider-knob-down rotate: false - xy: 570, 37 + xy: 473, 8 size: 11, 22 orig: 11, 22 offset: 0, 0 index: -1 slider-knob-over rotate: false - xy: 583, 37 + xy: 486, 8 size: 11, 22 orig: 11, 22 offset: 0, 0 index: -1 slider-vertical rotate: false - xy: 16, 2 + xy: 9, 2 size: 4, 1 orig: 4, 1 offset: 0, 0 @@ -1078,28 +1085,28 @@ splash_logo index: -1 splitpane rotate: false - xy: 22, 2 + xy: 548, 2 size: 4, 1 orig: 4, 1 offset: 0, 0 index: -1 splitpane-over rotate: false - xy: 28, 2 + xy: 15, 2 size: 4, 1 orig: 4, 1 offset: 0, 0 index: -1 splitpane-vertical rotate: false - xy: 848, 70 + xy: 1021, 109 size: 1, 4 orig: 1, 4 offset: 0, 0 index: -1 splitpane-vertical-over rotate: false - xy: 791, 48 + xy: 1021, 103 size: 1, 4 orig: 1, 4 offset: 0, 0 @@ -1112,16 +1119,24 @@ static-text orig: 7, 21 offset: 0, 0 index: -1 +sticky-note + rotate: false + xy: 531, 99 + size: 37, 27 + split: 14, 13, 10, 11 + orig: 37, 27 + offset: 0, 0 + index: -1 sub-menu rotate: false - xy: 794, 55 + xy: 521, 4 size: 4, 7 orig: 4, 7 offset: 0, 0 index: -1 sub-menu-bg rotate: false - xy: 524, 71 + xy: 511, 59 size: 14, 31 split: 2, 2, 0, 31 orig: 14, 31 @@ -1145,7 +1160,7 @@ tab-inactive index: -1 textfield rotate: false - xy: 964, 87 + xy: 772, 69 size: 14, 14 split: 2, 2, 3, 2 orig: 14, 14 @@ -1153,7 +1168,7 @@ textfield index: -1 textfield-light rotate: false - xy: 832, 60 + xy: 943, 76 size: 14, 14 split: 3, 3, 4, 3 orig: 14, 14 @@ -1161,7 +1176,7 @@ textfield-light index: -1 textfield-light-over rotate: false - xy: 816, 62 + xy: 610, 45 size: 14, 14 split: 3, 3, 4, 3 orig: 14, 14 @@ -1169,7 +1184,7 @@ textfield-light-over index: -1 textfield-over rotate: false - xy: 816, 62 + xy: 610, 45 size: 14, 14 split: 2, 2, 3, 2 orig: 14, 14 @@ -1177,7 +1192,7 @@ textfield-over index: -1 thumbnail rotate: false - xy: 826, 56 + xy: 916, 64 size: 4, 4 split: 1, 2, 1, 2 orig: 4, 4 @@ -1185,7 +1200,7 @@ thumbnail index: -1 thumbnail-over rotate: false - xy: 539, 4 + xy: 488, 2 size: 4, 4 split: 1, 2, 1, 2 orig: 4, 4 @@ -1193,7 +1208,7 @@ thumbnail-over index: -1 tint-border rotate: false - xy: 531, 2 + xy: 894, 62 size: 6, 6 split: 2, 2, 2, 2 orig: 6, 6 @@ -1201,56 +1216,56 @@ tint-border index: -1 tool-align rotate: false - xy: 920, 103 + xy: 997, 103 size: 22, 23 orig: 22, 23 offset: 0, 0 index: -1 tool-conuslight rotate: false - xy: 944, 103 + xy: 255, 2 size: 22, 23 orig: 22, 23 offset: 0, 0 index: -1 tool-label rotate: false - xy: 968, 103 + xy: 279, 2 size: 22, 23 orig: 22, 23 offset: 0, 0 index: -1 tool-mesh rotate: false - xy: 992, 103 + xy: 303, 2 size: 22, 23 orig: 22, 23 offset: 0, 0 index: -1 tool-move rotate: false - xy: 255, 2 + xy: 327, 2 size: 22, 23 orig: 22, 23 offset: 0, 0 index: -1 tool-sphericlight rotate: false - xy: 279, 2 + xy: 351, 2 size: 22, 23 orig: 22, 23 offset: 0, 0 index: -1 tool-transform rotate: false - xy: 303, 2 + xy: 375, 2 size: 22, 23 orig: 22, 23 offset: 0, 0 index: -1 toolbar-bg rotate: false - xy: 603, 40 + xy: 460, 2 size: 8, 4 split: 1, 2, 1, 1 orig: 8, 4 @@ -1258,7 +1273,7 @@ toolbar-bg index: -1 toolbar-down rotate: false - xy: 582, 4 + xy: 799, 58 size: 8, 9 split: 2, 2, 3, 3 orig: 8, 9 @@ -1266,7 +1281,7 @@ toolbar-down index: -1 toolbar-normal rotate: false - xy: 764, 53 + xy: 809, 58 size: 8, 9 split: 2, 2, 3, 3 orig: 8, 9 @@ -1274,7 +1289,7 @@ toolbar-normal index: -1 toolbar-over rotate: false - xy: 774, 53 + xy: 819, 58 size: 8, 9 split: 2, 2, 3, 3 orig: 8, 9 @@ -1282,7 +1297,7 @@ toolbar-over index: -1 tooltip-bg rotate: false - xy: 613, 36 + xy: 454, 27 size: 3, 3 split: 1, 1, 1, 1 orig: 3, 3 @@ -1290,35 +1305,35 @@ tooltip-bg index: -1 touchpad-knob rotate: false - xy: 780, 80 + xy: 748, 80 size: 22, 22 orig: 22, 22 offset: 0, 0 index: -1 tree-minus rotate: false - xy: 784, 54 + xy: 829, 59 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tree-over rotate: false - xy: 59, 2 + xy: 51, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 tree-plus rotate: false - xy: 592, 5 + xy: 839, 61 size: 8, 8 orig: 8, 8 offset: 0, 0 index: -1 tree-selection rotate: false - xy: 601, 33 + xy: 909, 63 size: 5, 5 split: 2, 2, 2, 2 pad: 1, 1, 1, 1 @@ -1327,91 +1342,91 @@ tree-selection index: -1 vis-blue rotate: false - xy: 62, 2 + xy: 54, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 vis-check rotate: false - xy: 980, 87 + xy: 788, 69 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-check-down rotate: false - xy: 996, 87 + xy: 804, 69 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-check-over rotate: false - xy: 603, 46 + xy: 820, 69 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-check-tick rotate: false - xy: 619, 47 + xy: 836, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-check-tick-disabled rotate: false - xy: 635, 47 + xy: 852, 71 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-radio rotate: false - xy: 651, 47 + xy: 874, 70 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-radio-down rotate: false - xy: 667, 47 + xy: 890, 70 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-radio-over rotate: false - xy: 683, 47 + xy: 906, 70 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-radio-tick rotate: false - xy: 699, 47 + xy: 922, 69 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-radio-tick-disabled rotate: false - xy: 715, 47 + xy: 959, 63 size: 14, 14 orig: 14, 14 offset: 0, 0 index: -1 vis-red rotate: false - xy: 65, 2 + xy: 57, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 white rotate: false - xy: 608, 30 + xy: 938, 75 size: 3, 3 orig: 3, 3 offset: 0, 0 @@ -1447,77 +1462,77 @@ window-action-close-pressed index: -1 window-action-iconify-hover rotate: false - xy: 522, 104 + xy: 570, 104 size: 33, 22 orig: 33, 22 offset: 0, 0 index: -1 window-action-iconify-normal rotate: false - xy: 557, 104 + xy: 605, 104 size: 33, 22 orig: 33, 22 offset: 0, 0 index: -1 window-action-iconify-pressed rotate: false - xy: 592, 104 + xy: 640, 104 size: 33, 22 orig: 33, 22 offset: 0, 0 index: -1 window-action-maximize-hover rotate: false - xy: 627, 104 + xy: 675, 104 size: 33, 22 orig: 33, 22 offset: 0, 0 index: -1 window-action-maximize-normal rotate: false - xy: 662, 104 + xy: 710, 104 size: 33, 22 orig: 33, 22 offset: 0, 0 index: -1 window-action-maximize-pressed rotate: false - xy: 697, 104 + xy: 745, 104 size: 33, 22 orig: 33, 22 offset: 0, 0 index: -1 window-action-restore-hover rotate: false - xy: 732, 104 + xy: 780, 104 size: 33, 22 orig: 33, 22 offset: 0, 0 index: -1 window-action-restore-normal rotate: false - xy: 767, 104 + xy: 815, 104 size: 33, 22 orig: 33, 22 offset: 0, 0 index: -1 window-action-restore-pressed rotate: false - xy: 802, 104 + xy: 850, 104 size: 33, 22 orig: 33, 22 offset: 0, 0 index: -1 window-bg rotate: false - xy: 68, 2 + xy: 60, 2 size: 1, 1 orig: 1, 1 offset: 0, 0 index: -1 window-noborder rotate: false - xy: 493, 92 + xy: 943, 92 size: 27, 34 split: 5, 4, 26, 3 orig: 27, 34 diff --git a/assets/style/uiskin.json b/assets/style/uiskin.json index 726cf1c7..c3a8333e 100644 --- a/assets/style/uiskin.json +++ b/assets/style/uiskin.json @@ -188,6 +188,11 @@ titleFont: big-font, background: panel, titleFontColor: white + }, + sticky-note: { + titleFont: big-font, + background: sticky-note, + titleFontColor: black } }, com.badlogic.gdx.scenes.scene2d.ui.ProgressBar$ProgressBarStyle: { @@ -290,6 +295,12 @@ fontColor: white, cursor: cursor }, + sticky-note: { + selection: selection, + font: default-font, + fontColor: black, + cursor: cursor + } code-editor: { errorBorder: border-error, font: default-mono-font, @@ -426,6 +437,9 @@ up: button-window-bg, imageUp: icon-close-white }, + sticky-note-pin: { + up: pin + }, close-node-window: { imageDown: close-node-pressed, imageOver: close-node-hover, diff --git a/assets/style/uiskin.png b/assets/style/uiskin.png index 0d79d4b2..9d30ef1d 100644 Binary files a/assets/style/uiskin.png and b/assets/style/uiskin.png differ diff --git a/src/main/java/games/rednblack/editor/view/ui/widget/actors/StickyNoteActor.java b/src/main/java/games/rednblack/editor/view/ui/widget/actors/StickyNoteActor.java index 5b92cbb8..6e93a9d8 100644 --- a/src/main/java/games/rednblack/editor/view/ui/widget/actors/StickyNoteActor.java +++ b/src/main/java/games/rednblack/editor/view/ui/widget/actors/StickyNoteActor.java @@ -1,5 +1,7 @@ package games.rednblack.editor.view.ui.widget.actors; +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.Input; import com.badlogic.gdx.graphics.g2d.Batch; import com.badlogic.gdx.math.Interpolation; import com.badlogic.gdx.math.Vector2; @@ -8,9 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.actions.Actions; import com.badlogic.gdx.scenes.scene2d.utils.ChangeListener; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; import com.badlogic.gdx.utils.Align; -import com.kotcrab.vis.ui.widget.VisImageButton; -import com.kotcrab.vis.ui.widget.VisTextArea; -import com.kotcrab.vis.ui.widget.VisWindow; +import com.kotcrab.vis.ui.widget.*; import games.rednblack.editor.HyperLap2DFacade; import games.rednblack.editor.controller.commands.ModifyStickyNoteCommand; import games.rednblack.editor.renderer.data.StickyNoteVO; @@ -27,11 +27,17 @@ public class StickyNoteActor extends VisWindow { private final Vector2 tmp = new Vector2(); private final VisTextArea contentArea; private final HyperLap2DFacade facade = HyperLap2DFacade.getInstance(); + private final VisImageButton pinButton; private int resizeBorder = 8; public StickyNoteActor(String id) { - super("", "default"); + super("", "sticky-note"); + pinButton = new VisImageButton("sticky-note-pin"); + pinButton.setX(-pinButton.getWidth() / 2f); + pinButton.setY(-pinButton.getHeight() / 2f); + this.getTitleTable().addActor(pinButton); + setMoveListener(); this.id = id; @@ -40,9 +46,9 @@ public class StickyNoteActor extends VisWindow { setKeepWithinStage(false); setResizable(true); - addCloseButton(); + //addCloseButton(); - contentArea = StandardWidgetsFactory.createTextArea(); + contentArea = StandardWidgetsFactory.createTextArea("sticky-note"); contentArea.addListener(new ChangeListener() { @Override public void changed(ChangeEvent event, Actor actor) { @@ -50,7 +56,21 @@ public class StickyNoteActor extends VisWindow { facade.sendNotification(MsgAPI.ACTION_MODIFY_STICKY_NOTE, payload); } }); - add(contentArea).grow(); + contentArea.addListener(new InputListener() { + @Override + public boolean touchDown(InputEvent event, float x, float y, int pointer, int button) { + return button == Input.Buttons.RIGHT || super.touchDown(event, x, y, pointer, button); + } + + @Override + public void touchUp(InputEvent event, float x, float y, int pointer, int button) { + if (button == Input.Buttons.RIGHT) { + showPopupMenu(); + } + } + }); + add(contentArea).padTop(5).padLeft(5).grow(); + setOrigin(Align.topLeft); } @Override @@ -85,11 +105,11 @@ public class StickyNoteActor extends VisWindow { public void show(Group parent) { parent.addActor(this); - float scale = Sandbox.getInstance().getZoomPercent() / 100f; - addAction(Actions.sequence( - Actions.scaleTo(0, 0), - Actions.scaleTo(scale > 1 ? 1f : scale, scale > 1 ? 1f : scale, .35f, Interpolation.swingOut) - )); + Action action = Actions.parallel(Actions.parallel(Actions.alpha(0), Actions.alpha(1, 0.125f)), + Actions.sequence(Actions.rotateBy(20), + Actions.rotateBy(-35, .25f, Interpolation.smoother), + Actions.rotateBy(15, .25f, Interpolation.swingOut))); + addAction(action); } /** @@ -196,7 +216,7 @@ public class StickyNoteActor extends VisWindow { } public boolean touchDown (InputEvent event, float x, float y, int pointer, int button) { - if (button == 0) { + if (button == Input.Buttons.LEFT) { updateEdge(x, y); dragging = edge != 0; startX = x; @@ -208,9 +228,13 @@ public class StickyNoteActor extends VisWindow { } public void touchUp (InputEvent event, float x, float y, int pointer, int button) { - dragging = false; - StickyNoteVO payload = ModifyStickyNoteCommand.payload(StickyNoteActor.this); - facade.sendNotification(MsgAPI.ACTION_MODIFY_STICKY_NOTE, payload); + if (button == Input.Buttons.LEFT) { + dragging = false; + StickyNoteVO payload = ModifyStickyNoteCommand.payload(StickyNoteActor.this); + facade.sendNotification(MsgAPI.ACTION_MODIFY_STICKY_NOTE, payload); + } else if (button == Input.Buttons.RIGHT) { + showPopupMenu(); + } } public void touchDragged (InputEvent event, float x, float y, int pointer) { @@ -273,4 +297,19 @@ public class StickyNoteActor extends VisWindow { } }); } + + private void showPopupMenu() { + PopupMenu popupMenu = new PopupMenu(); + MenuItem rename = new MenuItem("Remove note"); + rename.addListener( + new ClickListener(Input.Buttons.LEFT) { + @Override + public void clicked(InputEvent event, float x, float y) { + facade.sendNotification(MsgAPI.ACTION_REMOVE_STICKY_NOTE, id); + } + }); + popupMenu.addItem(rename); + popupMenu.setPosition(Gdx.input.getX(), Gdx.graphics.getHeight() - Gdx.input.getY() - popupMenu.getHeight()); + Sandbox.getInstance().getUIStage().addActor(popupMenu); + } }