From e8a9eea8e94914d3f4ce9fe5ceac0035bed8d99e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 28 Apr 2019 10:57:04 +0200 Subject: [PATCH] Revert previous 7 commits Was not intended for master. Revert "don't use workarea.y directly" This reverts commit cb67f451a26ba717b74bdcfce99fe289d1ff78e1. Revert "space: connect settings" This reverts commit 3c7ac9509ea44d705656935654fe0562bfcbe927. Revert "fixup! workspace menu: add zen toggle" This reverts commit bff403c1347ae0c44f87cd507b13a47d0a96880c. Revert "workspace menu: add zen toggle" This reverts commit 89bae34412a2dcd8da9e1171545dbd30d1665768. Revert "Implement" This reverts commit dd812e5714fea21701f0d2bcaa087df298338f7d. Revert "workspace schema: add `show-top-bar`" This reverts commit 7dcac8896ad5aebc0008be2e82cee1843c66a3d3. --- schemas/gschemas.compiled | Bin 4560 -> 4476 bytes ....shell.extensions.org-scrollwm.gschema.xml | 4 --- tiling.js | 22 +++---------- topbar.js | 31 +----------------- 4 files changed, 5 insertions(+), 52 deletions(-) diff --git a/schemas/gschemas.compiled b/schemas/gschemas.compiled index 3d22ec627a0db7beb7460b7f3a4e5b09179a13f2..9e0c1f283950d00448144ee094fd120b38b3a57f 100644 GIT binary patch delta 2005 zcmY*aeN0Y$__R?Soby?b~b1N77Md zvS~6mx7>+j8-~SArwd`poSF;`+l&zP4@_LP84Z3!WitxNNStPIo>S-_d&%iJ_uPAb z@BZ%n-Pf6_+xH#R>JoN=r%8}s2ig~+;I}Opif;4zXH4&IFNniUHa4&@H@aqfW>;z zNuSyR{}lK-aQ@Ze3HsEGe+z8O7Q*?|jYr`pQw?@hz}yJ@JT)-S3Dmjp>%rTA_Pxip z(5I%~0XBdq?sZ@C-=2AapRnhUxLz5#rB`Pv-gP?y8c$r0i~;EgX%YV@f& zz5%>FiJye&bZSN0p>600f?ole&YAXd0<{DFDEK4b;@F8z^r=_Ep8?MTs;}`E`qU-x zZ-LDgA$GfEHGOLO72r*P<#+pqBs)?KbkxIa0p7mYIz*qk2!0TJ2)Ms?(M6v+2mUB{ z9JqAlcxor8nb{=xTOc|=x1Qsv`Qim|j#UV4UGr7?(8<)9mBD-fSmXJ+n;q25tRDO{ zuw!g#tEp3G58eqloxQ0SQ1i$J!Jh-it+!Rip=L48fad_)(9~u6)MhToDu=QfZGJ5h zRlU8Ta3Io);(625EN8PSS74yLleI6u-><3Opc?85#^B7GPP%!WSXS6zu^PZhqRmK|mQ})U-2ik=I$`YF@1jCmCc$MR9mHERAxyo{n^|98tt{Qcn z!Xp33S?v+a?X6M2qN}J5mlAbHdqXjQ&>Pn=d%3?&7gqU$*&&~`Ov}furJI-i#&A?M zVt3EelxQqHZ)-S!4Q0^oNRR3@n4>&uZI(N&>oViIoVSi8ziTP7Gog+7Otwd~fZKq~ zw(=x>YHof9I0&Tg3pMYH4t@)`8JKS8czqK%GIW8T19q#^Mf9n8fpu^~ev{WB8}cj5T|W0x zX?eR891~-@Lhfo^i3R0;vr`_+Kkw_oDTVxs=IvIDu26WXia0D1*806szoGENLt!sY z$><5GC{u(DsGUk&i+O#D|K%&XCE!nmHuYw2NmuaIv0=_Cu94@a?RS=huL$3Pc7{>SkAcYvP<(%VPP4{rxp z2cFD3n&5cqER631?*c|j-nY}IX1%-yJ_u~7sip5rHBuj54hHT@m-+HNc(^DokZFaL zZWV+F{kYg_-%^Voa_*}?qD72!zpS^{aO;GN)6);bq-)uOo699U41NhvN{=MiPt9C( la2!bIPR-o=zzHCA+PLfc%x*bRXe-h}xPy2fE*^;4{|^#3mLmWF delta 2078 zcmZWq4NR1E9R5QbaK~{UBp!*FNOE_Z$JE?13r5Wn7Q-fE;YP)KcQ1EWFZbT=Jvb=h zbTiV*!d_*pPh60dBix+JEo&qhpm9zcPKQIiPE?6W@GgfC1^4!q(Z2z`9=^vZ#2%;qmv!TT zA4XEIWKO-8gVu`~LaY{TLYRcu0?b#6X8P1-_*LM2z^=b=!#?OH>Glg*P_;m~Xl<~rb0+?Q4daP@f9jJ5QZw7Az8oS@zN}rm3 z1NbT6!4>Wc^r<;cJNPBQlrO~Jc&K?yFS9)hgu9d9+BVQNFosSwZ`tRYmLeAiuxF$J(A{4 zsG$(npatR*0~QxoWOnHnv+u~o0E-=(g;{^ZT%?E0qjxV3rbt@i-++grK^!TE49ab? zqQ-ohobZJd)h{WU(910@{R@jXGtRvV{aH(GW@`++g+6N;N~PBqrnt8an33mM39bUZ ze>BfdpSlQs7~BFZl?*jYrXBnaa4k6A$arc8{A1w9Y(iYGs8{GyGvQ+3R$!p~>Syp% z#!CSjdSD&`K0F@uvjepq{`=r#K)k$8rBBTXM!;u)Kdv45oj$b_{(0~vK>K(sMxUCA zbp!k-u=Meu7UG^7<03cVGMB$Q`U^Wy8$}G(fZg(V9(`)o@Lupi{TpkOYvIa#A;~yS zBMF2j;?+0g7F&hK?=6c-i7f^xIesw8}VDe!bCuD0URmL8AhRijGBtyG9a zeQKK=Z;QxDBLqX?H4zC&imyeAhayqhCjBehO8tbbu$sZ~ND%p~CVT-k9+l%pzcela ziaTX)Gmn|6X#n$^^}@R4!@N(|o%W+CRds2Hv%>n)D@57k=rM&7+A*Ei$Ju9>f`3y0B~fml?Ze&EvBn zw;PQM|2w?o*K$kr5r;$n&f(lCEq}d}aeGky+|6F_eqgCqsJZAq@LB4`|1WB8asoUF UC=rx3>-ay3'' The background image - - false - Wether to hide the top bar or not - '' The background color diff --git a/tiling.js b/tiling.js index 24c3bac..f15e3a2 100644 --- a/tiling.js +++ b/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 { - 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' }); diff --git a/topbar.js b/topbar.js index 9fab24c..7ca0f7d 100644 --- a/topbar.js +++ b/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,