Skip to content

Commit f811869

Browse files
committed
better size definition
1 parent 0454765 commit f811869

File tree

3 files changed

+41
-48
lines changed

3 files changed

+41
-48
lines changed

data/Application.css

Lines changed: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -104,50 +104,44 @@ actionbar image {
104104

105105
/* Font zooms */
106106

107-
window.ants textview {font-size: 0.7em;}
108-
window.ants editablelabel {font-size: 0.55em;}
109-
window.ants editablelabel.editing {font-size: 0.50em;}
110107

111108

112-
window.somuchsmaller textview {font-size: 0.8em;}
113-
window.somuchsmaller editablelabel {font-size: 0.65em;}
114-
window.somuchsmaller editablelabel.editing {font-size: 0.60em;}
109+
window.muchsmaller textview {font-size: 0.6em;}
110+
window.muchsmaller editablelabel {font-size: 0.45em;}
111+
window.muchsmaller editablelabel.editing {font-size: 0.40em;}
115112

116-
window.muchsmaller textview {font-size: 0.9em;}
117-
window.muchsmaller editablelabel {font-size: 0.75em;}
118-
window.muchsmaller editablelabel.editing {font-size: 0.70em;}
113+
window.smaller textview {font-size: 0.8em;}
114+
window.smaller editablelabel {font-size: 0.65em;}
115+
window.smaller editablelabel.editing {font-size: 0.60em;}
119116

120-
window.smaller textview {font-size: 1.0em;}
121-
window.smaller editablelabel {font-size: 0.85em;}
122-
window.smaller editablelabel.editing {font-size: 0.80em;}
123-
124-
window.small textview {font-size: 1.1em;}
125-
window.small editablelabel {font-size: 0.95em;}
126-
window.small editablelabel.editing {font-size: 0.90em;}
117+
window.small textview {font-size: 1.0em;}
118+
window.small editablelabel {font-size: 0.85em;}
119+
window.small editablelabel.editing {font-size: 0.80em;}
127120

128121
window.normal_zoom textview {font-size: 1.2em;}
129122
window.normal_zoom editablelabel {font-size: 1.05em;}
130123
window.normal_zoom editablelabel.editing {font-size: 1em;}
131124

132-
window.big textview {font-size: 1.3em;}
133-
window.big editablelabel {font-size: 1.15em;}
134-
window.big editablelabel.editing {font-size: 1.10em;}
125+
window.big textview {font-size: 1.4em;}
126+
window.big editablelabel {font-size: 1.25em;}
127+
window.big editablelabel.editing {font-size: 1.20em;}
128+
129+
window.bigger textview {font-size: 1.6em;}
130+
window.bigger editablelabel {font-size: 1.45em;}
131+
window.bigger editablelabel.editing {font-size: 1.40em;}
135132

136-
window.bigger textview {font-size: 1.4em;}
137-
window.bigger editablelabel {font-size: 1.25em;}
138-
window.bigger editablelabel.editing {font-size: 1.20em;}
133+
window.muchbigger textview {font-size: 1.8em;}
134+
window.muchbigger editablelabel {font-size: 1.65em;}
135+
window.muchbigger editablelabel.editing {font-size: 1.60em;}
139136

140-
window.muchbigger textview {font-size: 1.5em;}
141-
window.muchbigger editablelabel {font-size: 1.35em;}
142-
window.muchbigger editablelabel.editing {font-size: 1.30em;}
137+
window.muchmuchbigger textview {font-size: 2em;}
138+
window.muchmuchbigger editablelabel {font-size: 1.85em;}
139+
window.muchmuchbigger editablelabel.editing {font-size: 1.80em;}
143140

144-
window.somuchbigger textview {font-size: 1.6em;}
145-
window.somuchbigger editablelabel {font-size: 1.45em;}
146-
window.somuchbigger editablelabel.editing {font-size: 1.40em;}
141+
window.huge textview {font-size: 2.2em;}
142+
window.huge editablelabel {font-size: 2.05em;}
143+
window.huge editablelabel.editing {font-size: 2.00em;}
147144

148-
window.urparent textview {font-size: 1.7em;}
149-
window.urparent editablelabel {font-size: 1.55em;}
150-
window.urparent editablelabel.editing {font-size: 1.50em;}
151145

152146

153147
/* ALL the colorpills */

src/MainWindow.vala

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ namespace jorts {
5252
public string content;
5353
public int64 zoom;
5454

55-
public static int max_zoom = 150;
56-
public static int min_zoom = 50;
55+
public static int max_zoom = 200;
56+
public static int min_zoom = 60;
5757

5858

5959
public Gtk.EditableLabel notetitle;
@@ -249,30 +249,29 @@ namespace jorts {
249249

250250
public string zoom_to_class(int64 zoom) {
251251
switch (zoom) {
252-
case 50: return "ants";
253-
case 60: return "somuchsmaller";
254-
case 70: return "muchsmaller";
255-
case 80: return "smaller";
256-
case 90: return "small";
252+
253+
case 40: return "muchsmaller";
254+
case 60: return "smaller";
255+
case 80: return "small";
257256
case 100: return "normal_zoom";
258-
case 110: return "big";
259-
case 120: return "bigger";
260-
case 130: return "muchbigger";
261-
case 140: return "somuchbigger";
262-
case 150: return "urparent";
257+
case 120: return "big";
258+
case 140: return "bigger";
259+
case 160: return "muchbigger";
260+
case 180: return "muchmuchbigger";
261+
case 200: return "huge";
263262
default: return "default";
264263
}
265264
}
266265

267266
public void zoom_in() {
268-
if ((this.zoom + 10) <= max_zoom) {
269-
this.set_zoom((this.zoom + 10));
267+
if ((this.zoom + 20) <= max_zoom) {
268+
this.set_zoom((this.zoom + 20));
270269
}
271270
}
272271

273272
public void zoom_out() {
274-
if ((this.zoom - 10) >= min_zoom) {
275-
this.set_zoom((this.zoom - 10));
273+
if ((this.zoom - 20) >= min_zoom) {
274+
this.set_zoom((this.zoom - 20));
276275
}
277276
}
278277

src/Widgets/SettingsPopover.vala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public class jorts.SettingsPopover : Gtk.Popover {
4545

4646
// Everything is in this
4747
var setting_grid = new Gtk.Grid ();
48-
setting_grid.set_margin_start (18);
48+
setting_grid.set_margin_start (12);
4949
setting_grid.set_margin_end (12);
5050
setting_grid.set_margin_top (6);
5151
setting_grid.set_margin_bottom (12);

0 commit comments

Comments
 (0)