Skip to content

Commit 25d3da2

Browse files
authored
Added sorting options for add node popup (contributed by williamchange)
Added sorting options for add node popup
2 parents 479d627 + 565690c commit 25d3da2

11 files changed

Lines changed: 725 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
@@ -404,6 +404,16 @@ metadata/recolor = true
404404
atlas = ExtResource("1_fw8f4")
405405
region = Rect2(32, 96, 16, 16)
406406

407+
[sub_resource type="AtlasTexture" id="AtlasTexture_t38jc"]
408+
atlas = ExtResource("1_fw8f4")
409+
region = Rect2(32, 224, 16, 16)
410+
metadata/scale = 2.0
411+
412+
[sub_resource type="AtlasTexture" id="AtlasTexture_j6702"]
413+
atlas = ExtResource("1_fw8f4")
414+
region = Rect2(48, 224, 16, 16)
415+
metadata/scale = 2.0
416+
407417
[sub_resource type="AtlasTexture" id="AtlasTexture_q32qs"]
408418
atlas = ExtResource("1_fw8f4")
409419
region = Rect2(32, 48, 16, 16)
@@ -416,6 +426,16 @@ region = Rect2(48, 48, 16, 16)
416426
atlas = ExtResource("1_fw8f4")
417427
region = Rect2(112, 176, 16, 16)
418428

429+
[sub_resource type="AtlasTexture" id="AtlasTexture_50kh2"]
430+
atlas = ExtResource("1_fw8f4")
431+
region = Rect2(96, 224, 16, 16)
432+
metadata/scale = 2.0
433+
434+
[sub_resource type="AtlasTexture" id="AtlasTexture_ivx1c"]
435+
atlas = ExtResource("1_fw8f4")
436+
region = Rect2(112, 224, 16, 16)
437+
metadata/scale = 2.0
438+
419439
[sub_resource type="AtlasTexture" id="AtlasTexture_7ns35"]
420440
atlas = ExtResource("1_fw8f4")
421441
region = Rect2(64, 160, 16, 16)
@@ -444,6 +464,16 @@ region = Rect2(16, 0, 16, 16)
444464
atlas = ExtResource("1_fw8f4")
445465
region = Rect2(0, 32, 16, 16)
446466

467+
[sub_resource type="AtlasTexture" id="AtlasTexture_6kl5u"]
468+
atlas = ExtResource("1_fw8f4")
469+
region = Rect2(64, 224, 16, 16)
470+
metadata/scale = 2.0
471+
472+
[sub_resource type="AtlasTexture" id="AtlasTexture_ya45l"]
473+
atlas = ExtResource("1_fw8f4")
474+
region = Rect2(80, 224, 16, 16)
475+
metadata/scale = 2.0
476+
447477
[sub_resource type="AtlasTexture" id="AtlasTexture_jxpkm"]
448478
atlas = ExtResource("1_fw8f4")
449479
region = Rect2(112, 128, 16, 16)
@@ -548,6 +578,10 @@ region = Rect2(48, 16, 16, 16)
548578
atlas = ExtResource("1_fw8f4")
549579
region = Rect2(0, 0, 16, 16)
550580

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

@@ -1134,16 +1168,22 @@ MM_Icons/icons/2D_preview = SubResource("AtlasTexture_1yu4y")
11341168
MM_Icons/icons/3D_preview = SubResource("AtlasTexture_ao7ds")
11351169
MM_Icons/icons/3D_preview_control = SubResource("AtlasTexture_hht3q")
11361170
MM_Icons/icons/add_image = SubResource("AtlasTexture_c5jyp")
1171+
MM_Icons/icons/alphabetical_ascending = SubResource("AtlasTexture_t38jc")
1172+
MM_Icons/icons/alphabetical_descending = SubResource("AtlasTexture_j6702")
11371173
MM_Icons/icons/arrow_left = SubResource("AtlasTexture_q32qs")
11381174
MM_Icons/icons/arrow_right = SubResource("AtlasTexture_r3xak")
11391175
MM_Icons/icons/arrow_updown = SubResource("AtlasTexture_dnklm")
1176+
MM_Icons/icons/category_ascending = SubResource("AtlasTexture_50kh2")
1177+
MM_Icons/icons/category_descending = SubResource("AtlasTexture_ivx1c")
11401178
MM_Icons/icons/color_picker = SubResource("AtlasTexture_7ns35")
11411179
MM_Icons/icons/delete = SubResource("AtlasTexture_agwde")
11421180
MM_Icons/icons/draw = SubResource("AtlasTexture_oy0ko")
11431181
MM_Icons/icons/dropdown = SubResource("AtlasTexture_2gawd")
11441182
MM_Icons/icons/environment = SubResource("AtlasTexture_x8swe")
11451183
MM_Icons/icons/export = SubResource("AtlasTexture_5e0gw")
11461184
MM_Icons/icons/folder = SubResource("AtlasTexture_rqlqa")
1185+
MM_Icons/icons/frequency_ascending = SubResource("AtlasTexture_6kl5u")
1186+
MM_Icons/icons/frequency_descending = SubResource("AtlasTexture_ya45l")
11471187
MM_Icons/icons/function = SubResource("AtlasTexture_jxpkm")
11481188
MM_Icons/icons/link = SubResource("AtlasTexture_c7xvc")
11491189
MM_Icons/icons/lock_locked = SubResource("AtlasTexture_m27ao")
@@ -1168,6 +1208,7 @@ MM_Icons/icons/spline_progressive = SubResource("AtlasTexture_70aex")
11681208
MM_Icons/icons/spline_reverse = SubResource("AtlasTexture_ahanl")
11691209
MM_Icons/icons/spline_unlink = SubResource("AtlasTexture_iofl8")
11701210
MM_Icons/icons/view = SubResource("AtlasTexture_en6gw")
1211+
MM_Icons/icons/zoom = SubResource("AtlasTexture_3gtjo")
11711212
MM_LibrarySectionButton/base_type = &"Button"
11721213
MM_LibrarySectionButton/colors/icon_disabled_color = Color(0.443137, 0.45098, 0.470588, 1)
11731214
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
@@ -445,6 +445,16 @@ region = Rect2(32, 208, 16, 16)
445445
atlas = ExtResource("1_s43fy")
446446
region = Rect2(0, 208, 16, 16)
447447

448+
[sub_resource type="AtlasTexture" id="AtlasTexture_ujqqf"]
449+
atlas = ExtResource("1_s43fy")
450+
region = Rect2(32, 224, 16, 16)
451+
metadata/scale = 2.0
452+
453+
[sub_resource type="AtlasTexture" id="AtlasTexture_0wsok"]
454+
atlas = ExtResource("1_s43fy")
455+
region = Rect2(48, 224, 16, 16)
456+
metadata/scale = 2.0
457+
448458
[sub_resource type="AtlasTexture" id="AtlasTexture_60g77"]
449459
atlas = ExtResource("1_s43fy")
450460
region = Rect2(96, 144, 16, 16)
@@ -465,6 +475,16 @@ region = Rect2(112, 176, 16, 16)
465475
atlas = ExtResource("1_s43fy")
466476
region = Rect2(80, 192, 16, 16)
467477

478+
[sub_resource type="AtlasTexture" id="AtlasTexture_ha0qk"]
479+
atlas = ExtResource("1_s43fy")
480+
region = Rect2(96, 224, 16, 16)
481+
metadata/scale = 2.0
482+
483+
[sub_resource type="AtlasTexture" id="AtlasTexture_4tel2"]
484+
atlas = ExtResource("1_s43fy")
485+
region = Rect2(112, 224, 16, 16)
486+
metadata/scale = 2.0
487+
468488
[sub_resource type="AtlasTexture" id="AtlasTexture_j13i3"]
469489
atlas = ExtResource("1_s43fy")
470490
region = Rect2(64, 160, 16, 16)
@@ -513,6 +533,16 @@ region = Rect2(16, 0, 16, 16)
513533
atlas = ExtResource("1_s43fy")
514534
region = Rect2(0, 32, 16, 16)
515535

536+
[sub_resource type="AtlasTexture" id="AtlasTexture_xdmf6"]
537+
atlas = ExtResource("1_s43fy")
538+
region = Rect2(64, 224, 16, 16)
539+
metadata/scale = 2.0
540+
541+
[sub_resource type="AtlasTexture" id="AtlasTexture_5jxva"]
542+
atlas = ExtResource("1_s43fy")
543+
region = Rect2(80, 224, 16, 16)
544+
metadata/scale = 2.0
545+
516546
[sub_resource type="AtlasTexture" id="AtlasTexture_0jwmb"]
517547
atlas = ExtResource("1_s43fy")
518548
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)