Skip to content

Commit c6c8918

Browse files
committed
Added sorting options for add node popup
1 parent 3985d36 commit c6c8918

11 files changed

Lines changed: 719 additions & 60 deletions

File tree

material_maker/globals.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ const DEFAULT_CONFIG : Dictionary = {
6161
node_minimize_button = false,
6262
node_close_button = false,
6363
ui_single_window_mode = false,
64+
add_node_popup_sort = SortMenu.Sorting.QUALITY_DESCENDING,
6465
}
6566

6667

material_maker/panels/preview_2d/simple_button.gd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
class_name SimpleButton
12
extends Button
23

34
@export var icon_name := ""

material_maker/theme/classic_base.tres

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,16 @@ metadata/recolor = true
402402
atlas = ExtResource("1_fw8f4")
403403
region = Rect2(32, 96, 16, 16)
404404

405+
[sub_resource type="AtlasTexture" id="AtlasTexture_t38jc"]
406+
atlas = ExtResource("1_fw8f4")
407+
region = Rect2(32, 224, 16, 16)
408+
metadata/scale = 2.0
409+
410+
[sub_resource type="AtlasTexture" id="AtlasTexture_j6702"]
411+
atlas = ExtResource("1_fw8f4")
412+
region = Rect2(48, 224, 16, 16)
413+
metadata/scale = 2.0
414+
405415
[sub_resource type="AtlasTexture" id="AtlasTexture_q32qs"]
406416
atlas = ExtResource("1_fw8f4")
407417
region = Rect2(32, 48, 16, 16)
@@ -414,6 +424,16 @@ region = Rect2(48, 48, 16, 16)
414424
atlas = ExtResource("1_fw8f4")
415425
region = Rect2(112, 176, 16, 16)
416426

427+
[sub_resource type="AtlasTexture" id="AtlasTexture_50kh2"]
428+
atlas = ExtResource("1_fw8f4")
429+
region = Rect2(96, 224, 16, 16)
430+
metadata/scale = 2.0
431+
432+
[sub_resource type="AtlasTexture" id="AtlasTexture_ivx1c"]
433+
atlas = ExtResource("1_fw8f4")
434+
region = Rect2(112, 224, 16, 16)
435+
metadata/scale = 2.0
436+
417437
[sub_resource type="AtlasTexture" id="AtlasTexture_7ns35"]
418438
atlas = ExtResource("1_fw8f4")
419439
region = Rect2(64, 160, 16, 16)
@@ -442,6 +462,16 @@ region = Rect2(16, 0, 16, 16)
442462
atlas = ExtResource("1_fw8f4")
443463
region = Rect2(0, 32, 16, 16)
444464

465+
[sub_resource type="AtlasTexture" id="AtlasTexture_6kl5u"]
466+
atlas = ExtResource("1_fw8f4")
467+
region = Rect2(64, 224, 16, 16)
468+
metadata/scale = 2.0
469+
470+
[sub_resource type="AtlasTexture" id="AtlasTexture_ya45l"]
471+
atlas = ExtResource("1_fw8f4")
472+
region = Rect2(80, 224, 16, 16)
473+
metadata/scale = 2.0
474+
445475
[sub_resource type="AtlasTexture" id="AtlasTexture_jxpkm"]
446476
atlas = ExtResource("1_fw8f4")
447477
region = Rect2(112, 128, 16, 16)
@@ -546,6 +576,10 @@ region = Rect2(48, 16, 16, 16)
546576
atlas = ExtResource("1_fw8f4")
547577
region = Rect2(0, 0, 16, 16)
548578

579+
[sub_resource type="AtlasTexture" id="AtlasTexture_3gtjo"]
580+
atlas = ExtResource("1_fw8f4")
581+
region = Rect2(112, 0, 16, 16)
582+
549583
[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_h5b0q"]
550584
bg_color = Color(0.266667, 0.278431, 0.301961, 1)
551585

@@ -1130,16 +1164,22 @@ MM_Icons/icons/2D_preview = SubResource("AtlasTexture_1yu4y")
11301164
MM_Icons/icons/3D_preview = SubResource("AtlasTexture_ao7ds")
11311165
MM_Icons/icons/3D_preview_control = SubResource("AtlasTexture_hht3q")
11321166
MM_Icons/icons/add_image = SubResource("AtlasTexture_c5jyp")
1167+
MM_Icons/icons/alphabetical_ascending = SubResource("AtlasTexture_t38jc")
1168+
MM_Icons/icons/alphabetical_descending = SubResource("AtlasTexture_j6702")
11331169
MM_Icons/icons/arrow_left = SubResource("AtlasTexture_q32qs")
11341170
MM_Icons/icons/arrow_right = SubResource("AtlasTexture_r3xak")
11351171
MM_Icons/icons/arrow_updown = SubResource("AtlasTexture_dnklm")
1172+
MM_Icons/icons/category_ascending = SubResource("AtlasTexture_50kh2")
1173+
MM_Icons/icons/category_descending = SubResource("AtlasTexture_ivx1c")
11361174
MM_Icons/icons/color_picker = SubResource("AtlasTexture_7ns35")
11371175
MM_Icons/icons/delete = SubResource("AtlasTexture_agwde")
11381176
MM_Icons/icons/draw = SubResource("AtlasTexture_oy0ko")
11391177
MM_Icons/icons/dropdown = SubResource("AtlasTexture_2gawd")
11401178
MM_Icons/icons/environment = SubResource("AtlasTexture_x8swe")
11411179
MM_Icons/icons/export = SubResource("AtlasTexture_5e0gw")
11421180
MM_Icons/icons/folder = SubResource("AtlasTexture_rqlqa")
1181+
MM_Icons/icons/frequency_ascending = SubResource("AtlasTexture_6kl5u")
1182+
MM_Icons/icons/frequency_descending = SubResource("AtlasTexture_ya45l")
11431183
MM_Icons/icons/function = SubResource("AtlasTexture_jxpkm")
11441184
MM_Icons/icons/link = SubResource("AtlasTexture_c7xvc")
11451185
MM_Icons/icons/lock_locked = SubResource("AtlasTexture_m27ao")
@@ -1164,6 +1204,7 @@ MM_Icons/icons/spline_progressive = SubResource("AtlasTexture_70aex")
11641204
MM_Icons/icons/spline_reverse = SubResource("AtlasTexture_ahanl")
11651205
MM_Icons/icons/spline_unlink = SubResource("AtlasTexture_iofl8")
11661206
MM_Icons/icons/view = SubResource("AtlasTexture_en6gw")
1207+
MM_Icons/icons/zoom = SubResource("AtlasTexture_3gtjo")
11671208
MM_LibrarySectionButton/base_type = &"Button"
11681209
MM_LibrarySectionButton/colors/icon_disabled_color = Color(0.443137, 0.45098, 0.470588, 1)
11691210
MM_LibrarySectionButton/colors/icon_focus_color = Color(1, 1, 1, 1)

material_maker/theme/default.tres

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,16 @@ region = Rect2(32, 208, 16, 16)
443443
atlas = ExtResource("1_s43fy")
444444
region = Rect2(0, 208, 16, 16)
445445

446+
[sub_resource type="AtlasTexture" id="AtlasTexture_ujqqf"]
447+
atlas = ExtResource("1_s43fy")
448+
region = Rect2(32, 224, 16, 16)
449+
metadata/scale = 2.0
450+
451+
[sub_resource type="AtlasTexture" id="AtlasTexture_0wsok"]
452+
atlas = ExtResource("1_s43fy")
453+
region = Rect2(48, 224, 16, 16)
454+
metadata/scale = 2.0
455+
446456
[sub_resource type="AtlasTexture" id="AtlasTexture_60g77"]
447457
atlas = ExtResource("1_s43fy")
448458
region = Rect2(96, 144, 16, 16)
@@ -463,6 +473,16 @@ region = Rect2(112, 176, 16, 16)
463473
atlas = ExtResource("1_s43fy")
464474
region = Rect2(80, 192, 16, 16)
465475

476+
[sub_resource type="AtlasTexture" id="AtlasTexture_ha0qk"]
477+
atlas = ExtResource("1_s43fy")
478+
region = Rect2(96, 224, 16, 16)
479+
metadata/scale = 2.0
480+
481+
[sub_resource type="AtlasTexture" id="AtlasTexture_4tel2"]
482+
atlas = ExtResource("1_s43fy")
483+
region = Rect2(112, 224, 16, 16)
484+
metadata/scale = 2.0
485+
466486
[sub_resource type="AtlasTexture" id="AtlasTexture_j13i3"]
467487
atlas = ExtResource("1_s43fy")
468488
region = Rect2(64, 160, 16, 16)
@@ -511,6 +531,16 @@ region = Rect2(16, 0, 16, 16)
511531
atlas = ExtResource("1_s43fy")
512532
region = Rect2(0, 32, 16, 16)
513533

534+
[sub_resource type="AtlasTexture" id="AtlasTexture_xdmf6"]
535+
atlas = ExtResource("1_s43fy")
536+
region = Rect2(64, 224, 16, 16)
537+
metadata/scale = 2.0
538+
539+
[sub_resource type="AtlasTexture" id="AtlasTexture_5jxva"]
540+
atlas = ExtResource("1_s43fy")
541+
region = Rect2(80, 224, 16, 16)
542+
metadata/scale = 2.0
543+
514544
[sub_resource type="AtlasTexture" id="AtlasTexture_0jwmb"]
515545
atlas = ExtResource("1_s43fy")
516546
region = Rect2(112, 128, 16, 16)
@@ -1353,11 +1383,15 @@ MM_Icons/icons/add_image = SubResource("AtlasTexture_86qok")
13531383
MM_Icons/icons/align_center = SubResource("AtlasTexture_khddu")
13541384
MM_Icons/icons/align_end = SubResource("AtlasTexture_xbfay")
13551385
MM_Icons/icons/align_start = SubResource("AtlasTexture_nw6qx")
1386+
MM_Icons/icons/alphabetical_ascending = SubResource("AtlasTexture_ujqqf")
1387+
MM_Icons/icons/alphabetical_descending = SubResource("AtlasTexture_0wsok")
13561388
MM_Icons/icons/arrange_nodes = SubResource("AtlasTexture_60g77")
13571389
MM_Icons/icons/arrow_left = SubResource("AtlasTexture_q32qs")
13581390
MM_Icons/icons/arrow_right = SubResource("AtlasTexture_r3xak")
13591391
MM_Icons/icons/arrow_updown = SubResource("AtlasTexture_ovvp6")
13601392
MM_Icons/icons/camera = SubResource("AtlasTexture_cscp3")
1393+
MM_Icons/icons/category_ascending = SubResource("AtlasTexture_ha0qk")
1394+
MM_Icons/icons/category_descending = SubResource("AtlasTexture_4tel2")
13611395
MM_Icons/icons/color_picker = SubResource("AtlasTexture_j13i3")
13621396
MM_Icons/icons/connection_bezier = SubResource("AtlasTexture_rqjp3")
13631397
MM_Icons/icons/connection_diagonal = SubResource("AtlasTexture_8tn7x")
@@ -1370,6 +1404,8 @@ MM_Icons/icons/dropdown = SubResource("AtlasTexture_2gawd")
13701404
MM_Icons/icons/environment = SubResource("AtlasTexture_x8swe")
13711405
MM_Icons/icons/export = SubResource("AtlasTexture_5e0gw")
13721406
MM_Icons/icons/folder = SubResource("AtlasTexture_rqlqa")
1407+
MM_Icons/icons/frequency_ascending = SubResource("AtlasTexture_xdmf6")
1408+
MM_Icons/icons/frequency_descending = SubResource("AtlasTexture_5jxva")
13731409
MM_Icons/icons/function = SubResource("AtlasTexture_0jwmb")
13741410
MM_Icons/icons/grid = SubResource("AtlasTexture_pkv4t")
13751411
MM_Icons/icons/link = SubResource("AtlasTexture_8uenv")

0 commit comments

Comments
 (0)