Skip to content

Commit 781b145

Browse files
mauroreisvieiramauroreisvieira
authored
Merge pull request #38 from deathaxe/fix/scrollbars
Fix various scroll bar issues
2 parents 165fd8d + 8cbe4b2 commit 781b145

File tree

2 files changed

+79
-53
lines changed

2 files changed

+79
-53
lines changed

‎Github.hidden-theme‎

Lines changed: 37 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -684,47 +684,53 @@
684684
},
685685
{
686686
"class": "scroll_bar_control",
687-
"settings": [
688-
"!overlay_scroll_bars"
687+
"parents": [
688+
{
689+
"class": "auto_complete_popup"
690+
}
689691
],
690-
"layer0.opacity": 1
692+
"tint_modifier": "var(autoCompleteBackground)"
691693
},
692694
{
693695
"class": "scroll_bar_control",
694696
"parents": [
695697
{
696-
"class": "popup_control auto_complete_popup"
698+
"class": "sidebar_container"
697699
}
698700
],
699-
"tint_modifier": [
700-
0,
701-
0,
702-
0,
703-
0.05
704-
]
701+
"tint_modifier": "var(sidebarBackground)"
705702
},
706703
{
707704
"class": "scroll_bar_control",
708705
"parents": [
709706
{
710-
"class": "switch_project_window"
707+
"class": "overlay_control"
711708
}
712709
],
713-
"layer0.tint": [
714-
235,
715-
237,
716-
239
717-
],
718-
"tint_index": -1
710+
"tint_modifier": "var(panelControlBackground)"
719711
},
720712
{
721713
"class": "scroll_bar_control",
722714
"parents": [
723715
{
724-
"class": "sidebar_container"
716+
"class": "switch_project_window"
725717
}
726718
],
727-
"layer0.opacity": 0
719+
"tint_modifier": "var(panelControlBackground)"
720+
},
721+
{
722+
"class": "scroll_corner_control",
723+
"tint_index": 0,
724+
"layer0.opacity": 1
725+
},
726+
{
727+
"class": "scroll_corner_control",
728+
"parents": [
729+
{
730+
"class": "auto_complete_popup"
731+
}
732+
],
733+
"tint_modifier": "var(autoCompleteBackground)"
728734
},
729735
{
730736
"class": "scroll_corner_control",
@@ -733,23 +739,25 @@
733739
"class": "sidebar_container"
734740
}
735741
],
736-
"layer0.opacity": 0,
737-
"layer0.tint": "var(sidebarBackground)"
742+
"tint_modifier": "var(sidebarBackground)"
738743
},
739744
{
740-
"class": "scroll_bar_control",
745+
"class": "scroll_corner_control",
741746
"parents": [
742747
{
743748
"class": "overlay_control"
744749
}
745750
],
746-
"layer0.opacity": 0,
747-
"content_margin": [
748-
4,
749-
0,
750-
0,
751-
0
752-
]
751+
"tint_modifier": "var(panelControlBackground)"
752+
},
753+
{
754+
"class": "scroll_corner_control",
755+
"parents": [
756+
{
757+
"class": "switch_project_window"
758+
}
759+
],
760+
"tint_modifier": "var(panelControlBackground)"
753761
},
754762
{
755763
"class": "scroll_track_control",
@@ -768,11 +776,6 @@
768776
"layer0.tint": "var(scrollTrack)",
769777
"layer0.opacity": 1
770778
},
771-
{
772-
"class": "scroll_corner_control",
773-
"layer0.opacity": 1,
774-
"tint_index": 0
775-
},
776779
{
777780
"class": "scroll_track_control",
778781
"attributes": [

‎src/theme.ts‎

Lines changed: 42 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -610,36 +610,54 @@ export function getRules() {
610610
},
611611
{
612612
class: 'scroll_bar_control',
613-
settings: ['!overlay_scroll_bars'],
614-
'layer0.opacity': 1,
613+
parents: [
614+
{
615+
class: 'auto_complete_popup',
616+
},
617+
],
618+
tint_modifier: 'var(autoCompleteBackground)',
615619
},
616620
{
617621
class: 'scroll_bar_control',
618622
parents: [
619623
{
620-
class: 'popup_control auto_complete_popup',
624+
class: 'sidebar_container',
621625
},
622626
],
623-
tint_modifier: [0, 0, 0, 0.05],
627+
tint_modifier: 'var(sidebarBackground)',
624628
},
625629
{
626630
class: 'scroll_bar_control',
627631
parents: [
628632
{
629-
class: 'switch_project_window',
633+
class: 'overlay_control',
630634
},
631635
],
632-
'layer0.tint': [235, 237, 239],
633-
tint_index: -1,
636+
tint_modifier: 'var(panelControlBackground)',
634637
},
635638
{
636639
class: 'scroll_bar_control',
637640
parents: [
638641
{
639-
class: 'sidebar_container',
642+
class: 'switch_project_window',
640643
},
641644
],
642-
'layer0.opacity': 0,
645+
tint_modifier: 'var(panelControlBackground)',
646+
},
647+
648+
{
649+
class: 'scroll_corner_control',
650+
tint_index: 0,
651+
'layer0.opacity': 1,
652+
},
653+
{
654+
class: 'scroll_corner_control',
655+
parents: [
656+
{
657+
class: 'auto_complete_popup',
658+
},
659+
],
660+
tint_modifier: 'var(autoCompleteBackground)',
643661
},
644662
{
645663
class: 'scroll_corner_control',
@@ -648,19 +666,27 @@ export function getRules() {
648666
class: 'sidebar_container',
649667
},
650668
],
651-
'layer0.opacity': 0,
652-
"layer0.tint": "var(sidebarBackground)"
669+
tint_modifier: 'var(sidebarBackground)',
653670
},
654671
{
655-
class: 'scroll_bar_control',
672+
class: 'scroll_corner_control',
656673
parents: [
657674
{
658675
class: 'overlay_control',
659676
},
660677
],
661-
'layer0.opacity': 0,
662-
content_margin: [4, 0, 0, 0],
678+
tint_modifier: 'var(panelControlBackground)',
663679
},
680+
{
681+
class: 'scroll_corner_control',
682+
parents: [
683+
{
684+
class: 'switch_project_window',
685+
},
686+
],
687+
tint_modifier: 'var(panelControlBackground)',
688+
},
689+
664690
{
665691
class: 'scroll_track_control',
666692
'layer0.tint': 'var(scrollBar)',
@@ -673,11 +699,7 @@ export function getRules() {
673699
'layer0.tint': 'var(scrollTrack)',
674700
'layer0.opacity': 1,
675701
},
676-
{
677-
class: 'scroll_corner_control',
678-
'layer0.opacity': 1,
679-
tint_index: 0,
680-
},
702+
681703
{
682704
class: 'scroll_track_control',
683705
attributes: ['horizontal'],
@@ -689,6 +711,7 @@ export function getRules() {
689711
attributes: ['horizontal'],
690712
'layer0.tint': 'var(scrollTrack)',
691713
},
714+
692715
{
693716
class: 'progress_bar_control',
694717
'layer0.tint': ['background', 0.94],

0 commit comments

Comments
 (0)