experiments in a post-browser web
Merge pull request #9 from autonome/layoutfix
fix layout in settings
authored by
Dietrich Ayala
and committed by
GitHub
0e465406
38bbd345
+3
-40
+1
-2
features/settings/content.css
+1
-2
features/settings/content.css
+1
-9
features/settings/content.js
+1
-9
features/settings/content.js
···
34
34
panes = [];
35
35
}
36
36
37
-
let rowContainer = document.createElement('div');
38
-
39
37
cfg.features.forEach((feature, i) => {
40
-
// new row
41
-
if (i % 2 == 0) {
42
-
rowContainer = document.createElement('div');
43
-
container.appendChild(rowContainer);
44
-
}
45
-
46
38
const type = feature.labels.featureType;
47
39
48
40
const paneContainer = document.createElement('div');
49
-
rowContainer.appendChild(paneContainer);
41
+
container.appendChild(paneContainer);
50
42
51
43
const allowNew = feature.config.allowNew || false;
52
44
const disabled = feature.config.disabled || [];
+1
-29
index.js
+1
-29
index.js
···
63
63
const features = {
64
64
settings: require('./features/settings/settings'),
65
65
cmd: require('./features/cmd/cmd'),
66
-
peeks: require('./features/peeks/peeks'),
67
66
slides: require('./features/slides/slides'),
67
+
peeks: require('./features/peeks/peeks'),
68
68
scripts: require('./features/scripts/scripts'),
69
69
};
70
70
···
82
82
83
83
// vestigial?
84
84
let _windows = [];
85
-
86
-
// main window
87
-
let _win = null;
88
85
89
86
// TODO: make this open settings?
90
87
app.on('activate', () => {
···
261
258
262
259
const fwin = BrowserWindow.getFocusedWindow();
263
260
264
-
//
265
261
if (!fwin.isDestroyed()) {
266
-
console.log('esc: killingit');
267
262
fwin.close();
268
-
//win.destroy();
269
-
//_win = null;
270
263
}
271
-
//
272
-
/*
273
-
if (win.isVisible()) {
274
-
console.log('win is visible, hide it');
275
-
win.hide();
276
-
}
277
-
*/
278
264
});
279
265
280
266
···
349
335
// explicitly with Cmd + Q.
350
336
app.on('window-all-closed', () => {
351
337
console.log('window-all-closed', process.platform);
352
-
/*
353
-
if (!_win.isDestroyed()) {
354
-
console.log('wac: killingit');
355
-
_win.destroy();
356
-
_win = null;
357
-
}
358
-
*/
359
-
/*
360
-
if (_win.isVisible()) {
361
-
console.log('win is visible, hide it');
362
-
//_win.hide();
363
-
}
364
-
*/
365
-
366
338
if (process.platform !== 'darwin') {
367
339
onQuit();
368
340
}