mirror of
https://github.com/gosticks/PaperWM.git
synced 2026-07-01 14:40:02 +00:00
Revert previous 7 commits
Was not intended for master. Revert "don't use workarea.y directly" This reverts commitcb67f451a2. Revert "space: connect settings" This reverts commit3c7ac9509e. Revert "fixup! workspace menu: add zen toggle" This reverts commitbff403c134. Revert "workspace menu: add zen toggle" This reverts commit89bae34412. Revert "Implement" This reverts commitdd812e5714. Revert "workspace schema: add `show-top-bar`" This reverts commit7dcac8896a.
This commit is contained in:
Binary file not shown.
@@ -169,10 +169,6 @@
|
||||
<default>''</default>
|
||||
<summary>The background image</summary>
|
||||
</key>
|
||||
<key type="b" name="show-top-bar">
|
||||
<default>false</default>
|
||||
<summary>Wether to hide the top bar or not</summary>
|
||||
</key>
|
||||
<key type="s" name="color">
|
||||
<default>''</default>
|
||||
<summary>The background color</summary>
|
||||
|
||||
22
tiling.js
22
tiling.js
@@ -370,9 +370,9 @@ class Space extends Array {
|
||||
this._inLayout = false;
|
||||
return;
|
||||
}
|
||||
let availableHeight = (workArea.y - this.monitor.y + workArea.height -
|
||||
(panelBox.height)*this.showTopBar - prefs.vertical_margin);
|
||||
let y0 = (panelBox.height)*this.showTopBar + prefs.vertical_margin;
|
||||
|
||||
let availableHeight = (workArea.height - prefs.vertical_margin);
|
||||
let y0 = workArea.y - this.monitor.y + prefs.vertical_margin;
|
||||
let fixPointAttempCount = 0;
|
||||
|
||||
for (let i=0; i<this.length; i++) {
|
||||
@@ -857,8 +857,6 @@ class Space extends Array {
|
||||
this.updateColor();
|
||||
this.updateBackground();
|
||||
this.updateName();
|
||||
this.layout();
|
||||
this.showTopBar = this.settings.get_boolean('show-top-bar');
|
||||
this.signals.connect(this.settings, 'changed::name',
|
||||
this.updateName.bind(this));
|
||||
this.signals.connect(Settings.settings, 'changed::use-workspace-name',
|
||||
@@ -867,18 +865,6 @@ class Space extends Array {
|
||||
this.updateColor.bind(this));
|
||||
this.signals.connect(this.settings, 'changed::background',
|
||||
this.updateBackground.bind(this));
|
||||
this.signals.connect(this.settings, 'changed::show-top-bar',
|
||||
() => {
|
||||
if (this.settings.get_boolean('show-top-bar')) {
|
||||
this.showTopBar = 1;
|
||||
TopBar.show();
|
||||
} else {
|
||||
this.showTopBar = 1;
|
||||
TopBar.hide();
|
||||
}
|
||||
|
||||
this.layout.bind(this);
|
||||
});
|
||||
}
|
||||
|
||||
updateColor() {
|
||||
@@ -2017,7 +2003,7 @@ function animateDown(metaWindow) {
|
||||
let buffer = metaWindow.get_buffer_rect();
|
||||
let clone = metaWindow.clone;
|
||||
Tweener.addTween(metaWindow.clone, {
|
||||
y: (panelBox.height + prefs.vertical_margin)*0 ,
|
||||
y: panelBox.height + prefs.vertical_margin,
|
||||
time: prefs.animation_time,
|
||||
transition: 'easeInOutQuad'
|
||||
});
|
||||
|
||||
31
topbar.js
31
topbar.js
@@ -157,12 +157,6 @@ class WorkspaceMenu extends PanelMenu.Button {
|
||||
this._contentBox.add_actor(this.colors.actor);
|
||||
this.menu.box.add_actor(this._contentBox);
|
||||
|
||||
this._zenItem = new PopupMenu.PopupSwitchMenuItem('show top bar', true);
|
||||
this.menu.addMenuItem(this._zenItem);
|
||||
this._zenItem.connect('toggled', item => {
|
||||
Tiling.spaces.selectedSpace.settings.set_boolean('show-top-bar', item.state);
|
||||
});
|
||||
|
||||
this.prefsIcon = new St.Button({ reactive: true,
|
||||
can_focus: true,
|
||||
track_hover: true,
|
||||
@@ -386,7 +380,6 @@ class WorkspaceMenu extends PanelMenu.Button {
|
||||
this.colors.actor.hint_text = space.name;
|
||||
}
|
||||
|
||||
this._zenItem._switch.setToggleState(space.settings.get_boolean('show-top-bar'));
|
||||
}
|
||||
|
||||
workspaceSwitched(wm, fromIndex, toIndex) {
|
||||
@@ -447,26 +440,8 @@ function enable () {
|
||||
updateWorkspaceIndicator(to);
|
||||
}));
|
||||
|
||||
signals.connect(Main.overview, 'showing', show);
|
||||
signals.connect(Main.overview, 'hidden', () => {
|
||||
if (Tiling.spaces.selectedSpace.settings.get_boolean('show-top-bar'))
|
||||
return;
|
||||
hide();
|
||||
});
|
||||
|
||||
signals.connect(panelBox, 'show', () => {
|
||||
if (Tiling.spaces.selectedSpace.settings.get_boolean('show-top-bar'))
|
||||
show();
|
||||
else {
|
||||
if (Main.overview.visible)
|
||||
return;
|
||||
hide();
|
||||
}
|
||||
});
|
||||
signals.connect(panelBox, 'show', show);
|
||||
signals.connect(panelBox, 'hide', () => {
|
||||
if (!Tiling.spaces.selectedSpace.settings.get_boolean('show-top-bar'))
|
||||
return;
|
||||
|
||||
if (display.focus_window.fullscreen) {
|
||||
hide();
|
||||
} else {
|
||||
@@ -491,9 +466,6 @@ function disable() {
|
||||
}
|
||||
|
||||
function show() {
|
||||
if (!Main.overview.visible &&
|
||||
!Tiling.spaces.selectedSpace.settings.get_boolean('show-top-bar'))
|
||||
return;
|
||||
panelBox.show();
|
||||
Tweener.addTween(panelBox, {
|
||||
scale_y: 1,
|
||||
@@ -505,7 +477,6 @@ function show() {
|
||||
}
|
||||
|
||||
function hide() {
|
||||
panelBox.hide();
|
||||
Tweener.addTween(panelBox, {
|
||||
scale_y: 0,
|
||||
time: prefs.animation_time,
|
||||
|
||||
Reference in New Issue
Block a user