Skip to content

Commit ad57456

Browse files
bor-Tbor-T
committed
UI works. Tab control.
1 parent 035abf7 commit ad57456

File tree

3 files changed

+59
-36
lines changed

3 files changed

+59
-36
lines changed

‎res/main/schema/legacy-dark.xml

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<border_color value="#373943"/>
9898
<text_prim value="#71758c"/>
9999
<text_sec value="#71758c"/>
100+
<text_tab value="#585d7b"/>
100101
<text_icon value="#9095b3"/>
101102
<lsp_logo value="#239db5"/>
102103
<lsp_logo_cover value="#a4ed3b"/>
@@ -355,7 +356,7 @@
355356
<fade_out.color value="#dd2abecc"/>
356357
<fade_in.border.color value="#882abecc"/>
357358
<fade_out.border.color value="#882abecc"/>
358-
359+
359360
<stretch.color value="stretch_color" />
360361
<stretch.border.color value="stretch_border_color" />
361362
<loop.color value="loop_color" />
@@ -1566,31 +1567,41 @@
15661567
</style>
15671568

15681569
<style class="Switch" parents="root"></style>
1569-
1570+
15701571
<style class="Tab" parents="root">
1571-
<color value="#cccccc" />
1572-
<selected.color value="#ffffff" />
1573-
<hover.color value="#00ccff" />
1574-
1572+
<color value="bg_light" />
1573+
<selected.color value="bg_name" />
1574+
<hover.color value="bg_name" />
1575+
15751576
<border.color value="#888888" />
15761577
<border.selected.color value="#000000" />
15771578
<border.hover.color value="#eeeeee" />
1578-
1579-
<text.color value="#888888" />
1580-
<text.selected.color value="#000000" />
1581-
<text.hover.color value="#eeeeee" />
1582-
1583-
<border.size value="1" />
1579+
1580+
<text.color value="text_tab" />
1581+
<text.selected.color value="text_group" />
1582+
<text.hover.color value="text_prim" />
1583+
1584+
<text.padding.bottom value="0"/>
1585+
<text.padding.top value="0"/>
1586+
1587+
<border.size value="0" />
15841588
<border.radius value="4" />
15851589
</style>
1586-
1590+
15871591
<style class="TabControl" parents="root">
1588-
<border.color value="#888888" />
1592+
<border.color value="bg_name" />
1593+
<heading.color value="bg_name" />
1594+
<heading.spacing.color value="bg_name" />
1595+
<heading.gap.color value="bg_schema" />
15891596
<border.size value="2" />
15901597
<border.radius value="10" />
1591-
<tab.spacing value="1" />
1598+
<tab.spacing value="4" />
15921599
<head.spacing value="-1" />
15931600
<tab.joint value="true" />
1601+
<heading.gap value="0" />
1602+
<heading.fill value="false" />
1603+
<heading.spacing.fill value="false" />
1604+
<pointer value="hand"/>
15941605
</style>
15951606

15961607
<!-- FileDialog widgets -->

‎res/main/schema/legacy.xml

Lines changed: 27 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<border_color value="#373943"/>
9898
<text_prim value="#ebecee"/>
9999
<text_sec value="#cacbcd"/>
100+
<text_tab value="#27282e"/>
100101
<text_icon value="#ebecee"/>
101102
<lsp_logo value="#00b1eb"/>
102103
<lsp_logo_cover value="#00e2ff"/>
@@ -358,7 +359,7 @@
358359
<fade_out.color value="#88ffff00"/>
359360
<fade_in.border.color value="#ffff00"/>
360361
<fade_out.border.color value="#ffff00"/>
361-
362+
362363
<stretch.color value="stretch_color" />
363364
<stretch.border.color value="stretch_border_color" />
364365
<loop.color value="loop_color" />
@@ -386,7 +387,7 @@
386387
<wave.border value="1"/>
387388
<stretch.border value="1" />
388389
<loop.border value="1" />
389-
390+
390391
<stretch.color value="stretch_color" />
391392
<stretch.border.color value="stretch_border_color" />
392393
<loop.color value="loop_color" />
@@ -1572,31 +1573,41 @@
15721573
</style>
15731574

15741575
<style class="Switch" parents="root"></style>
1575-
1576+
15761577
<style class="Tab" parents="root">
1577-
<color value="#cccccc" />
1578-
<selected.color value="#ffffff" />
1579-
<hover.color value="#00ccff" />
1580-
1578+
<color value="gray" />
1579+
<selected.color value="bg_name" />
1580+
<hover.color value="bg_name" />
1581+
15811582
<border.color value="#888888" />
15821583
<border.selected.color value="#000000" />
15831584
<border.hover.color value="#eeeeee" />
1584-
1585-
<text.color value="#888888" />
1586-
<text.selected.color value="#000000" />
1587-
<text.hover.color value="#eeeeee" />
1588-
1589-
<border.size value="1" />
1585+
1586+
<text.color value="text_tab"/>
1587+
<text.selected.color value="text_group" />
1588+
<text.hover.color value="text_group" />
1589+
1590+
<text.padding.bottom value="0"/>
1591+
<text.padding.top value="0"/>
1592+
1593+
<border.size value="0" />
15901594
<border.radius value="4" />
15911595
</style>
1592-
1596+
15931597
<style class="TabControl" parents="root">
1594-
<border.color value="#888888" />
1598+
<border.color value="bg_name" />
1599+
<heading.color value="bg_name" />
1600+
<heading.spacing.color value="bg_name" />
1601+
<heading.gap.color value="bg_schema" />
15951602
<border.size value="2" />
15961603
<border.radius value="10" />
1597-
<tab.spacing value="1" />
1604+
<tab.spacing value="4" />
15981605
<head.spacing value="-1" />
15991606
<tab.joint value="true" />
1607+
<heading.gap value="0" />
1608+
<heading.fill value="false" />
1609+
<heading.spacing.fill value="false" />
1610+
<pointer value="hand"/>
16001611
</style>
16011612

16021613
<!-- FileDialog widgets -->

‎res/main/schema/modern.xml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
<border_color value="#373943"/>
9898
<text_prim value="#8088b3"/>
9999
<text_sec value="#a8aed3"/>
100+
<text_tab value="#585d7b"/>
100101
<text_icon value="#747994"/>
101102
<lsp_logo value="#239db5"/>
102103
<lsp_logo_cover value="#a4ed3b"/>
@@ -1568,20 +1569,19 @@
15681569
<border.selected.color value="#000000" />
15691570
<border.hover.color value="#eeeeee" />
15701571

1571-
<text.color value="text_prim" />
1572+
<text.color value="text_tab" />
15721573
<text.selected.color value="text_group" />
15731574
<text.hover.color value="text_prim" />
15741575
<text.padding.left value="6"/>
15751576
<text.padding.right value="6"/>
1576-
1577-
<pointer value="hand"/>
1577+
<text.padding.bottom value="0"/>
15781578

15791579
<border.size value="0" />
15801580
<border.radius value="0" />
15811581
</style>
15821582

15831583
<style class="TabControl" parents="root">
1584-
<border.color value="#888888" />
1584+
<border.color value="bg_name" />
15851585
<heading.color value="bg_name" />
15861586
<heading.spacing.color value="bg_name" />
15871587
<heading.gap.color value="bg_schema" />
@@ -1591,8 +1591,9 @@
15911591
<heading.spacing value="2" />
15921592
<heading.gap value="4" />
15931593
<tab.joint value="true" />
1594-
<heading.fill value="true" />
1594+
<heading.fill value="false" />
15951595
<heading.spacing.fill value="true" />
1596+
<pointer value="hand"/>
15961597
</style>
15971598

15981599
<!-- FileDialog widgets -->

0 commit comments

Comments
 (0)