Skip to content

Commit 833bc43

Browse files
vixalienvixalien
committed
fix #48 
1 parent 98b7497 commit 833bc43

File tree

2 files changed

+105
-84
lines changed

2 files changed

+105
-84
lines changed

‎data/stylus/style.styl‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
@import 'colors.styl';
22
@import 'notes.styl';
3+
@import 'util.styl';
34

45
.container {
56
transition: 0.35s background-color ease-out, 0.35s color ease-out;
@@ -14,25 +15,34 @@
1415
color: inherit;
1516
}
1617

17-
.header-bar, .toolbar, .separator {
18+
.header-bar, .toolbar-container {
1819
transition: none;
1920
}
2021

2122
.container:not(:focus-within) {
22-
.header-bar, .toolbar, .separator {
23+
.header-bar, .toolbar-container {
2324
transition: 0.25s opacity ease-out;
2425
opacity: 0;
26+
27+
&:hover {
28+
opacity: 1;
29+
transition: 0;
30+
}
31+
}
32+
33+
.header-bar:backdrop > * {
34+
opacity: 1;
2535
}
2636
}
2737

2838
for name, info in colors {
2939
.container.style-{name} {
30-
&, & popover > arrow, & popover > contents, ~/ {
40+
&, & popover > arrow, & popover > contents, .toolbar-container, ~/ {
3141
background-color: info.bg;
3242
color: info.fg;
3343
}
3444
}
35-
45+
3646
.container.style-{name} .header-bar {
3747
background-color: info.header;
3848
}

‎data/ui/window.ui‎

Lines changed: 91 additions & 80 deletions
Original file line numberDiff line numberDiff line change
@@ -12,99 +12,110 @@
1212
<class name="style-specifity"/>
1313
</style>
1414
<child>
15-
<object class="AdwHeaderBar">
15+
<object class="GtkOverlay">
1616
<property name="hexpand">true</property>
17-
<child type="start">
18-
<object class="GtkButton">
19-
<property name="icon-name">list-add-symbolic</property>
20-
<property name="action-name">app.new-note</property>
21-
<property name="tooltip-text" translatable="yes">New Note</property>
22-
</object>
23-
</child>
24-
<child type="end">
25-
<object class="GtkMenuButton" id="menu_button">
26-
<property name="icon-name">open-menu-symbolic</property>
27-
<property name="menu-model">app_menu</property>
28-
<property name="tooltip-text" translatable="yes">Main Menu</property>
29-
<property name="primary">true</property>
30-
</object>
31-
</child>
32-
<property name="title-widget">
33-
<object class="GtkBox"></object>
34-
</property>
35-
<style>
36-
<class name="flat"/>
37-
<class name="header-bar"/>
38-
</style>
39-
</object>
40-
</child>
41-
<child>
42-
<object class="GtkScrolledWindow">
4317
<property name="vexpand">true</property>
44-
<child>
45-
<object class="GtkTextView" id="text">
46-
<property name="editable">true</property>
47-
<property name="wrap-mode">word-char</property>
48-
<property name="top-margin">12</property>
49-
<property name="bottom-margin">12</property>
50-
<property name="left-margin">12</property>
51-
<property name="right-margin">12</property>
18+
<child type="overlay">
19+
<object class="AdwHeaderBar" id="headerbar">
20+
<property name="hexpand">true</property>
21+
<property name="valign">start</property>
22+
<child type="start">
23+
<object class="GtkButton">
24+
<property name="icon-name">list-add-symbolic</property>
25+
<property name="action-name">app.new-note</property>
26+
<property name="tooltip-text" translatable="true">New Note</property>
27+
</object>
28+
</child>
29+
<child type="end">
30+
<object class="GtkMenuButton" id="menu_button">
31+
<property name="icon-name">open-menu-symbolic</property>
32+
<property name="menu-model">app_menu</property>
33+
<property name="tooltip-text" translatable="true">Main Menu</property>
34+
<property name="primary">true</property>
35+
</object>
36+
</child>
37+
<property name="title-widget">
38+
<object class="GtkBox"></object>
39+
</property>
5240
<style>
53-
<class name="text-view"/>
41+
<class name="flat"/>
42+
<class name="header-bar"/>
5443
</style>
5544
</object>
5645
</child>
57-
</object>
58-
</child>
59-
<child>
60-
<object class="GtkBox">
61-
<property name="orientation">vertical</property>
62-
<property name="valign">end</property>
6346
<child>
64-
<object class="GtkSeparator">
65-
<property name="valign">end</property>
66-
<style>
67-
<class name="separator"/>
68-
</style>
47+
<object class="GtkScrolledWindow" id="scrolled">
48+
<property name="vexpand">true</property>
49+
<property name="hexpand">true</property>
50+
<child>
51+
<object class="GtkTextView" id="text">
52+
<property name="editable">true</property>
53+
<property name="wrap-mode">word-char</property>
54+
<property name="top-margin">60</property>
55+
<property name="bottom-margin">60</property>
56+
<property name="left-margin">12</property>
57+
<property name="right-margin">12</property>
58+
<style>
59+
<class name="text-view"/>
60+
</style>
61+
</object>
62+
</child>
6963
</object>
7064
</child>
71-
<child>
72-
<object class="GtkBox">
65+
<child type="overlay">
66+
<object class="GtkBox" id="toolbar">
67+
<property name="orientation">vertical</property>
7368
<property name="valign">end</property>
7469
<style>
75-
<class name="toolbar"/>
76-
<class name="flat"/>
70+
<class name="toolbar-container"/>
7771
</style>
7872
<child>
79-
<object class="GtkToggleButton" id="bold_button">
80-
<property name="icon-name">format-text-bold-symbolic</property>
81-
<property name="action-name">win.bold</property>
82-
<property name="focus-on-click">false</property>
83-
<property name="tooltip-text" translatable="yes">Bold</property>
84-
</object>
85-
</child>
86-
<child>
87-
<object class="GtkToggleButton" id="italic_button">
88-
<property name="icon-name">format-text-italic-symbolic</property>
89-
<property name="action-name">win.italic</property>
90-
<property name="focus-on-click">false</property>
91-
<property name="tooltip-text" translatable="yes">Italic</property>
92-
</object>
93-
</child>
94-
<child>
95-
<object class="GtkToggleButton" id="underline_button">
96-
<property name="icon-name">format-text-underline-symbolic</property>
97-
<property name="action-name">win.underline</property>
98-
<property name="focus-on-click">false</property>
99-
<property name="tooltip-text" translatable="yes">Underline</property>
73+
<object class="GtkSeparator">
74+
<property name="valign">end</property>
75+
<style>
76+
<class name="separator"/>
77+
</style>
10078
</object>
10179
</child>
10280
<child>
103-
<object class="GtkToggleButton" id="strikethrough_button">
104-
<property name="icon-name">format-text-strikethrough-symbolic</property>
105-
<property name="action-name">win.strikethrough</property>
106-
<property name="focus-on-click">false</property>
107-
<property name="tooltip-text" translatable="yes">Strikethrough</property>
81+
<object class="GtkBox">
82+
<property name="valign">end</property>
83+
<style>
84+
<class name="toolbar"/>
85+
<class name="flat"/>
86+
</style>
87+
<child>
88+
<object class="GtkToggleButton" id="bold_button">
89+
<property name="icon-name">format-text-bold-symbolic</property>
90+
<property name="action-name">win.bold</property>
91+
<property name="focus-on-click">false</property>
92+
<property name="tooltip-text" translatable="true">Bold</property>
93+
</object>
94+
</child>
95+
<child>
96+
<object class="GtkToggleButton" id="italic_button">
97+
<property name="icon-name">format-text-italic-symbolic</property>
98+
<property name="action-name">win.italic</property>
99+
<property name="focus-on-click">false</property>
100+
<property name="tooltip-text" translatable="true">Italic</property>
101+
</object>
102+
</child>
103+
<child>
104+
<object class="GtkToggleButton" id="underline_button">
105+
<property name="icon-name">format-text-underline-symbolic</property>
106+
<property name="action-name">win.underline</property>
107+
<property name="focus-on-click">false</property>
108+
<property name="tooltip-text" translatable="true">Underline</property>
109+
</object>
110+
</child>
111+
<child>
112+
<object class="GtkToggleButton" id="strikethrough_button">
113+
<property name="icon-name">format-text-strikethrough-symbolic</property>
114+
<property name="action-name">win.strikethrough</property>
115+
<property name="focus-on-click">false</property>
116+
<property name="tooltip-text" translatable="true">Strikethrough</property>
117+
</object>
118+
</child>
108119
</object>
109120
</child>
110121
</object>
@@ -122,13 +133,13 @@
122133
</section>
123134
<section>
124135
<item>
125-
<attribute name="label" translatable="yes">All Notes</attribute>
136+
<attribute name="label" translatable="true">All Notes</attribute>
126137
<attribute name="action">app.all-notes</attribute>
127138
</item>
128139
<item>
129-
<attribute name="label" translatable="yes">Delete Note</attribute>
140+
<attribute name="label" translatable="true">Delete Note</attribute>
130141
<attribute name="action">win.delete</attribute>
131142
</item>
132143
</section>
133144
</menu>
134-
</interface>
145+
</interface>

0 commit comments

Comments
 (0)