diff options
Diffstat (limited to 'extensions/vertical-workspaces')
38 files changed, 11161 insertions, 0 deletions
diff --git a/extensions/vertical-workspaces/CHANGELOG.md b/extensions/vertical-workspaces/CHANGELOG.md new file mode 100644 index 0000000..a11360e --- /dev/null +++ b/extensions/vertical-workspaces/CHANGELOG.md @@ -0,0 +1,147 @@ +## Changelog: + +### v24 (not released yet) +**Added:** +- Support for horizontally stacked workspaces, available through `Workspaces Thumbnails Position` option. +- Options `Workspaces Scale` and `Workspaces Spacing` adjustments for workspace preview. +- Options `App Search Icon Size` with reduced spacing between icons and `Search Results Width`. +- Option `Workspace Switcher Animation` / `Static Backgroud` for static background while switching workspaces outside of the overview. +- Open preferences by middle click on *Show Applications button* in the dash (default dash only). +- Text shadow in labels of app grid view icons for better visibility on lighter backgrounds, in case you use `Show Static Background` option for the overview. + +**Fixed:** +- Improved blur effect transitions performance +- Smaller single windows not properly scaling with workspace preview in `Expose Windows on Hover` mode. +- (upstream bug) Closing windows in the overview fills log with "access to destroyed" object errors. + +**Other changes:** + + +### v23 (v19, v20, v21, v22) (2022-12-22) +**Added:** +- Overview modes `Expose Windows on Hover` and `Static Workspace` +- Option `Always Show Window Titles` +- Option `Dash Background Radius` +- Option `Animation Speed` + +**Fixed:** +- Startup animation can still freeze Shell in certain configuration. Injection replaced by complete override of the *startupAnimation()* function. +- Workaround for upstream bug - stuttering first animation of App Grid with many icons. + +**Other changes:** +- Preferences split into more sections for better readability. + +### v17, v18 (2022-12-07) +**Added:** +- Separate scales for blur amount in overview window picker and app grid/search results. +- Option `Smooth Blur Transitions` allows to disable smooth blur transitions on slower hw. + +**Fixed:** +- Startup animation can freeze Shell if `Show Workspace Preview Background` option disabled. +- Secondary workspace thumbnails not visible in overview after starting GS. +- Dash, WS thumbnails and Search entry animations exceptions. +- App grid animates over the Dash instead below it. + +**Other changes:** +- Default Dash background opacity set to 40. +- Workspace thumbnail caption style. + +### v16 (2022-12-05) +**Fixed:** +- Dash to Dock compatibility. +- Improved static background transitions. + +### v15 (2022-12-01) +**Fixed:** +- Dash / ws thumbnails shifted after disable, if ws preview background is disabled. +- Delayed dash / ws thumbnails animation after screen unlocks. + +### v14 (2022-11-29 e.g.o only) +**Added:** +- Option `Show Static Background` allows keep background wallpaper in the Activities overview. +- Slider `Blur Static Background` allows add blur to the static background image. +- Search result style - added bit of transparency to look better with static background. +- Link to changelog on About page. + +**Fixed:** +- Option `Override Page Up/Down Shortcuts` doesn't work reliably. + +**Other changes:** +- Next/Prev page indicators in GS43 are hard to switch from horizontal orientation to vertical, so for now I added style that makes them look more like vertical arrows indicating direction to the prev/next page. + +### v13 (2022-10-20) +**Added:** +- Horizontal 3 finger gesture automatically changes its direction depending on the workspace thumbnails position to match direction of the transition animation. +- Vertically oriented Dash items can be selected and activated even with the pointer at the edge of the screen. +- Option `Startup State` allows to change GNOME Shell's startup state from Overview to Desktop. +- Option `Always Show Search Entry` now allows showing the search entry even if the search is not active. + +**Fixed** +- 3 finger gestures not having proper orientation when used for the first time after enabling the extension. +- Dash overlapping workspace during transition between normal view and overview when using a 3 finger gesture. +- Dash icons can get out of border when dash size reach its maximum. +- Smaller workspace preview size if DtD set to auto-hide. +- Dash startup animation doesn't respect Dash position, workspace thumbnails don't animate at all. + +### v12 2022-09-04 +**Fixed:** +- Dash to Dock compatibility issue when original Dash set to vertical position + +### v11 2022-09-04 +**Added** +- Window preview app icon size +- About page +- Reset button that allows to set all options to their default values +- GNOME Shell 43 support +- Automatic `Fix for Dash to Dock` option activation when DtD detected during enabling + +**Fixed** +- App Grid page indicator not vertical +- Workspace thumbnail caption can show window title from different workspace (typically VBox Machine) + +### v10 2022-08-03 +**Added:** +- Option `Show Workspace Preview Background` allows to hide background wallpaper in the overview. + +**Fixed:** +- Broken overview after *Dash to Dock* disabled. + +**Other changes:** +- Preferences reorganized + +### v9 2022-07-31 +**Added:** +- Option `Show Workspace Labels` allows to show label on each workspace thumbnail. Options: `Index`, `Index + Workspace Name`, `Index + App Name` +- Option `Show Workspace Label on Hover` hides the labels until mouse hovers over a thumbnail. +- Option to hide Workspace Thumbnails on primary and secondary monitors individually in their position option list. +- Independent position adjustment for secondary monitors workspace thumbnails. +- Vertical workspace switcher popup. +- Settings page `Content` has been removed and `Disable` options were added to the position option list of the `Dash` and `Workspace Thumbnails`. + +### v8 22-07-27 +**Added:** +- **Vertical Dash** which can be placed at the left and right side of the screen, in addition to top and bottom positions. +- `Fine Tune Position` sliders for Dash and window switcher. +- `Dash Height Max Scale` option has been replaced by `Dash Max Icon Size` option which allows more precise setting. + +### v7 22-07-23 +**Fixed:** +- Fix of `Fix for Dash to Dock` + +### v6 22-07-23 +**Added:** +- Option `Auto` to App Grid Animation menu, changes animation direction according to workspace switcher position and visibility. +- Option `Fix for Dash to Dock` helps to keep VW consistent when DtD updates its position and while updating monitors configuration. + +**Fixed:** +- Dash position can be off a little bit with `Center Dash to WS` option. +- Secondary monitor overview transitions + +### v5 2022-07-20 +**Added:** +- `Content` page in Preferences window with options to hide Dash, workspace switcher and wallpaper in workspace thumbnails. +- New transition animations between Window Picker, App Grid and Desktop views. +- Workspace and App Grid animation options. +- Option to automatically switch `(Shift +) Super + Page Up/Down` keyboard shortcuts for the current workspace orientation. +- Option to expand workspace thumbnails to entire height of the work area at the expense of Dash width. + diff --git a/extensions/vertical-workspaces/LICENSE b/extensions/vertical-workspaces/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/extensions/vertical-workspaces/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + <program> Copyright (C) <year> <name of author> + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +<https://www.gnu.org/licenses/>. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +<https://www.gnu.org/licenses/why-not-lgpl.html>. diff --git a/extensions/vertical-workspaces/Makefile b/extensions/vertical-workspaces/Makefile new file mode 100644 index 0000000..b0afba4 --- /dev/null +++ b/extensions/vertical-workspaces/Makefile @@ -0,0 +1,90 @@ +SHELL := /bin/bash + +# Replace these with the name and domain of your extension! +NAME := vertical-workspaces +DOMAIN := G-dH.github.com +ZIP_NAME := $(NAME)@$(DOMAIN).zip + +# Some of the recipes below depend on some of these files. +JS_FILES = $(shell find -type f -and \( -name "*.js" \)) +UI_FILES = $(shell find -type f -and \( -name "*.ui" \)) +#RESOURCE_FILES = $(shell find resources -mindepth 2 -type f) +LOCALES_PO = $(wildcard po/*.po) +LOCALES_MO = $(patsubst po/%.po,locale/%/LC_MESSAGES/$(NAME).mo,$(LOCALES_PO)) + +# These files will be included in the extension zip file. +ZIP_CONTENT = $(JS_FILES) $(LOCALES_MO) \ + schemas/* schemas/gschemas.compiled metadata.json LICENSE stylesheet.css + +# These six recipes can be invoked by the user. +.PHONY: all zip install uninstall pot clean + +all: $(ZIP_CONTENT) + +# The zip recipes only bundles the extension without installing it. +zip: $(ZIP_NAME) + +# The install recipes creates the extension zip and installs it. +install: $(ZIP_NAME) + gnome-extensions install "$(ZIP_NAME)" --force + @echo "Extension installed successfully! Now restart the Shell ('Alt'+'F2', then 'r' or log out/log in on Wayland)." + +# This uninstalls the previously installed extension. +uninstall: + gnome-extensions uninstall "$(NAME)@$(DOMAIN)" + +# Use gettext to generate a translation template file. +pot: $(JS_FILES) $(UI_FILES) + @echo "Generating '$(NAME).pot'..." + @xgettext --from-code=UTF-8 \ + --add-comments=Translators \ + --copyright-holder="GdH" \ + --package-name="$(NAME)" \ + --output=po/$(NAME).pot \ + $(JS_FILES) $(UI_FILES) + +# This removes all temporary files created with the other recipes. +clean: + rm -rf $(ZIP_NAME) \ + schemas/gschemas.compiled \ + locale + +# This bundles the extension and checks whether it is small enough to be uploaded to +# extensions.gnome.org. We do not use "gnome-extensions pack" for this, as this is not +# readily available on the GitHub runners. +$(ZIP_NAME): $(ZIP_CONTENT) + @echo "Packing zip file..." + @rm --force $(ZIP_NAME) + @zip $(ZIP_NAME) -- $(ZIP_CONTENT) + + @#Check if the zip size is too big to be uploaded + @SIZE=$$(unzip -Zt $(ZIP_NAME) | awk '{print $$3}') ; \ + if [[ $$SIZE -gt 5242880 ]]; then \ + echo "ERROR! The extension is too big to be uploaded to" \ + "the extensions website, keep it smaller than 5 MB!"; \ + exit 1; \ + fi + +# Compiles the gschemas.compiled file from the gschema.xml file. +schemas/gschemas.compiled: schemas/org.gnome.shell.extensions.$(NAME).gschema.xml + @echo "Compiling schemas..." + @glib-compile-schemas schemas + +# Compiles the gresource file from the gresources.xml. +#resources/$(NAME).gresource: resources/$(NAME).gresource.xml +# @echo "Compiling resources..." +# @glib-compile-resources --sourcedir="resources" --generate resources/$(NAME).gresource.xml + +# Generates the gresources.xml based on all files in the resources subdirectory. +#resources/$(NAME).gresource.xml: $(RESOURCE_FILES) +# @echo "Creating resources xml..." +# @FILES=$$(find "resources" -mindepth 2 -type f -printf "%P\n" | xargs -i echo "<file>{}</file>") ; \ + echo "<?xml version='1.0' encoding='UTF-8'?><gresources><gresource> $$FILES </gresource></gresources>" \ + > resources/$(NAME).gresource.xml + +# Compiles all *.po files to *.mo files. +locale/%/LC_MESSAGES/$(NAME).mo: po/%.po + @echo "Compiling $@" + @mkdir -p locale/$*/LC_MESSAGES + @msgfmt -c -o $@ $< + diff --git a/extensions/vertical-workspaces/README.md b/extensions/vertical-workspaces/README.md new file mode 100644 index 0000000..49faf8f --- /dev/null +++ b/extensions/vertical-workspaces/README.md @@ -0,0 +1,72 @@ +# V-Shell (former Vertical Workspaces) + +A GNOME Shell extension that lets you customize your desktop interface to suit your workflow and style. You can change the horizontal stacking of workspaces to vertical, but also change layout, content, appearance and behavior of the Shell. Forget Dash to Dock and similar dock extensions, with V-Shell you don't need it, just use Static Workspace option. + +Supported GNOME versions: 42, 43 (dropped support for 40, 41 - not tested). + +## Features +- Vertically or horizontally stacked workspaces. +- Position, orientation, scale and visibility of the overview content. +- Support for secondary monitors, workspaces thumbnails can be placed on the opposite side relative to primary monitor. Removes unnecessary transitions. +- Static background with blur adjustments. +- 2 overview modes with static windows/workspace that expose windows on hover/click on workspace thumbnail. The *Static Workspace* option allows you to use dash like a dock with auto-hide but with all advantages of the activities overview. +- Custom dash icons size and behavior when clicked. +- Dash background transparency and corner radius adjustments. +- App grid icon size, number of columns and rows. +- Custom search view width, app results icons size and number of result lists rows. +- Workspace thumbnails can show background wallpaper and labels (always or on mouse hover) with combination of workspace index, workspace name, name of the current application and current window title. +- Title captions of window previews moves into the preview (originally beneath the preview) and can be set as always visible. +- Static background in workspace switcher (outside overview). Keeps Conky below, DING desktop icons stay visible (if not covered by windows). +- More efficient and visually appealing transition animations (compared to the original Shell) that can be customized or disabled. +- Animation/transition speed adjustment. +- Window search provider with *Space* hotkey allows quick window navigation. +- Recent files search provider with *Ctrl + Space* hotkey. +- Reorder workspaces in overview using *Shift + Scroll* or *Shift + Page Up/Down* +- Adds *Force Quit*, *Close Windows on Current Workspace* and *Move Windows to Current Workspace* items to app icon menu. The latter action can be activated using *Shift + click* on app icon. + + +[<img alt="" height="100" src="https://raw.githubusercontent.com/andyholmes/gnome-shell-extensions-badge/master/get-it-on-ego.svg?sanitize=true">](https://extensions.gnome.org/extension/5177/vertical-workspaces/) + + + +## Installation + +### Installation from extensions.gnome.org +The easiest way to install the latest stable release of V-Shell: go to [extensions.gnome.org](https://extensions.gnome.org/extension/5177/vertical-workspaces/) and toggle the switch. + +### Installation from the latest Github release +Download the latest release archive using following command: + + wget https://github.com/G-dH/vertical-workspaces/releases/latest/download/vertical-workspaces@G-dH.github.com.zip + +Install the extension (`--force` switch needs to be used only if some version of the extension is already installed): + + gnome-extensions install --force vertical-workspaces@G-dH.github.com.zip + +### Installation from GitHub repository +The most recent version in the repository is the one I'm currently using and developing on my own systems, problems may occur, but usually nothing serious. The repository version may change often and doesn't updates automatically on your system, but once the stable release shows up on extensions.gnome.org, it should be updated automatically from there. If you want to help me, use this latest version and report bugs. +You may need to install `git`, `gettext` and `glib2.0` for successful installation. +Navigate to the directory you want to download the source code and execute following commands in the terminal: + + git clone https://github.com/G-dH/vertical-workspaces.git + cd vertical-workspaces + make install + +### Enabling the extension +After installation you need to enable the extension and access its settings. + +- First restart GNOME Shell (`ALt` + `F2`, `r`, `Enter`, or Log Out/Log In if you use Wayland) +- Now you should see *Vertical Workspaces* extension in *Extensions* application (re-open the app if needed to load new data), where you can enable it and access its Preferences window by pressing `Settings` button. + +## Credits +This extension uses customized utils and dash modules of the [Vertical Overview extension](https://github.com/RensAlthuis/vertical-overview). + +## Buy me a coffee +If you like my extensions and want to keep me motivated, you can also buy me a coffee: +[buymeacoffee.com/georgdh](https://buymeacoffee.com/georgdh) + + + + + +
\ No newline at end of file diff --git a/extensions/vertical-workspaces/appDisplay.js b/extensions/vertical-workspaces/appDisplay.js new file mode 100644 index 0000000..4690fcf --- /dev/null +++ b/extensions/vertical-workspaces/appDisplay.js @@ -0,0 +1,944 @@ +/** + * Vertical Workspaces + * appDisplay.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { Clutter, GLib, GObject, Graphene, Meta, Shell, St } = imports.gi; + +const DND = imports.ui.dnd; +const Main = imports.ui.main; +const AppDisplay = imports.ui.appDisplay; +const IconGrid = imports.ui.iconGrid; +const { AppMenu } = imports.ui.appMenu; +const PopupMenu = imports.ui.popupMenu; +const BoxPointer = imports.ui.boxpointer; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); +const IconGridOverride = Me.imports.iconGrid; + +const _Util = Me.imports.util; +let _overrides; + +let _appGridLayoutSettings; +let _appDisplayScrollConId; +let _appSystemStateConId; +let _appGridLayoutConId; +let _updateAppGridTimeoutId; +let _origAppDisplayAcceptDrop; +let _origAppViewItemAcceptDrop; +let _origAppViewItemHandleDragOver; + +let opt; +let shellVersion = _Util.shellVersion; + + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + if (reset) { + _setAppDisplayOrientation(false); + _updateAppGridProperties(reset); + _updateAppGridDND(reset); + _restoreOverviewGroup(); + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + + _overrides = new _Util.Overrides(); + + if (opt.ORIENTATION === Clutter.Orientation.VERTICAL) { + _overrides.addOverride('AppDisplayVertical', AppDisplay.AppDisplay.prototype, AppDisplayVertical); + _overrides.addOverride('BaseAppViewVertical', AppDisplay.BaseAppView.prototype, BaseAppViewVertical); + } + + _overrides.addOverride('AppSearchProvider', AppDisplay.AppSearchProvider.prototype, AppSearchProvider); + + // Custom App Grid + _overrides.addOverride('AppFolderDialog', AppDisplay.AppFolderDialog.prototype, AppFolderDialog); + if (shellVersion >= 43) { + // const defined class needs to be touched before real access + AppDisplay.BaseAppViewGridLayout; + _overrides.addOverride('BaseAppViewGridLayout', AppDisplay.BaseAppViewGridLayout.prototype, BaseAppViewGridLayout); + _overrides.addOverride('IconGrid', IconGrid.IconGrid.prototype, IconGridOverride.IconGrid); + } + _overrides.addOverride('FolderView', AppDisplay.FolderView.prototype, FolderView); + _overrides.addInjection('AppFolderDialog', AppDisplay.AppFolderDialog.prototype, AppFolderDialogInjections); + _overrides.addOverride('AppIcon', AppDisplay.AppIcon.prototype, AppIcon); + _overrides.addOverride('BaseAppView', AppDisplay.BaseAppView.prototype, BaseAppView); + _overrides.addOverride('AppDisplay', AppDisplay.AppDisplay.prototype, AppDisplayCommon); + + + _setAppDisplayOrientation(opt.ORIENTATION === Clutter.Orientation.VERTICAL); + _updateAppGridProperties(); + _updateAppGridDND(); +} + +//--------------------------------------------------------------------------------------------------------- + +function _setAppDisplayOrientation(vertical = false) { + const CLUTTER_ORIENTATION = vertical ? Clutter.Orientation.VERTICAL : Clutter.Orientation.HORIZONTAL; + const scroll = vertical ? 'vscroll' : 'hscroll'; + // app display to vertical has issues - page indicator not working + // global appDisplay orientation switch is not built-in + let appDisplay = Main.overview._overview._controls._appDisplay; + // following line itself only changes in which axis will operate overshoot detection which switches appDisplay pages while dragging app icon to vertical + appDisplay._orientation = CLUTTER_ORIENTATION; + appDisplay._grid.layoutManager._orientation = CLUTTER_ORIENTATION; + appDisplay._swipeTracker.orientation = CLUTTER_ORIENTATION; + appDisplay._swipeTracker._reset(); + if (vertical) { + appDisplay._scrollView.set_policy(St.PolicyType.NEVER, St.PolicyType.EXTERNAL); + + // move and change orientation of page indicators + // needs corrections in appgrid page calculations, e.g. appDisplay.adaptToSize() fnc, + // which complicates use of super call inside the function + const pageIndicators = appDisplay._pageIndicators; + pageIndicators.vertical = true; + appDisplay._box.vertical = false; + pageIndicators.x_expand = false; + pageIndicators.y_align = Clutter.ActorAlign.CENTER; + pageIndicators.x_align = Clutter.ActorAlign.START; + + const scrollContainer = appDisplay._scrollView.get_parent(); + if (shellVersion < 43) { + // remove touch friendly side navigation bars / arrows + appDisplay._hintContainer && scrollContainer.remove_child(appDisplay._hintContainer); + } else { + // moving these bars needs more patching of the appDisplay's code + // for now we just change bars style to be more like vertically oriented arrows indicating direction to prev/next page + appDisplay._nextPageIndicator.add_style_class_name('nextPageIndicator'); + appDisplay._prevPageIndicator.add_style_class_name('prevPageIndicator'); + } + + // setting their x_scale to 0 removes the arrows and avoid allocation issues compared to .hide() them + appDisplay._nextPageArrow.scale_x = 0; + appDisplay._prevPageArrow.scale_x = 0; + } else { + appDisplay._scrollView.set_policy(St.PolicyType.EXTERNAL, St.PolicyType.NEVER); + if (_appDisplayScrollConId) { + appDisplay._adjustment.disconnect(_appDisplayScrollConId); + _appDisplayScrollConId = 0; + } + + // restore original page indicators + const pageIndicators = appDisplay._pageIndicators; + pageIndicators.vertical = false; + appDisplay._box.vertical = true; + pageIndicators.x_expand = true; + pageIndicators.y_align = Clutter.ActorAlign.END; + pageIndicators.x_align = Clutter.ActorAlign.CENTER; + + // put back touch friendly navigation bars/buttons + const scrollContainer = appDisplay._scrollView.get_parent(); + appDisplay._hintContainer && appDisplay._hintContainer.get_parent() == null && scrollContainer.add_child(appDisplay._hintContainer); + appDisplay._nextPageArrow.scale_x = 1; + appDisplay._prevPageArrow.scale_x = 1; + + appDisplay._nextPageIndicator.remove_style_class_name('nextPageIndicator'); + appDisplay._prevPageIndicator.remove_style_class_name('prevPageIndicator'); + } + + // value for page indicator is calculated from scroll adjustment, horizontal needs to be replaced by vertical + appDisplay._adjustment = appDisplay._scrollView[scroll].adjustment; + + // no need to connect already connected signal (wasn't removed the original one before) + if (!vertical) { + // reset used appdisplay properties + Main.overview._overview._controls._appDisplay.scale_y = 1; + Main.overview._overview._controls._appDisplay.scale_x = 1; + Main.overview._overview._controls._appDisplay.opacity = 255; + return; + } + + // update appGrid dot pages indicators + _appDisplayScrollConId = appDisplay._adjustment.connect('notify::value', adj => { + const value = adj.value / adj.page_size; + appDisplay._pageIndicators.setCurrentPosition(value); + }); +} + +// Set App Grid columns, rows, icon size, incomplete pages +function _updateAppGridProperties(reset = false) { + // columns, rows, icon size + const appDisplay = Main.overview._overview._controls._appDisplay; + appDisplay.visible = true; + + // replace isFavorite function to always return false to allow dnd with favorite apps + if (!reset && opt.APP_GRID_INCLUDE_DASH) { + if (!appDisplay._appFavorites._backupIsFavorite) { + appDisplay._appFavorites._backupIsFavorite = appDisplay._appFavorites.isFavorite; + } + appDisplay._appFavorites.isFavorite = () => false; + } else { + if (appDisplay._appFavorites._backupIsFavorite) { + appDisplay._appFavorites.isFavorite = appDisplay._appFavorites._backupIsFavorite; + appDisplay._appFavorites._backupIsFavorite = undefined; + } + } + + if (reset) { + appDisplay._grid.layout_manager.fixedIconSize = -1; + appDisplay._grid.layoutManager.allow_incomplete_pages = true; + appDisplay._grid.setGridModes(); + if (_appGridLayoutSettings) { + _appGridLayoutSettings.disconnect(_appGridLayoutConId); + _appGridLayoutConId = 0; + _appGridLayoutSettings = null; + } + appDisplay._redisplay(); + // secondary call is necessary to properly update app grid + appDisplay._redisplay(); + } else { + // update grid on layout reset + if (!_appGridLayoutSettings) { + _appGridLayoutSettings = ExtensionUtils.getSettings('org.gnome.shell'); + _appGridLayoutConId = _appGridLayoutSettings.connect('changed::app-picker-layout', _resetAppGrid); + } + + // remove icons from App Grid + _resetAppGrid(); + + const updateGrid = function(rows, columns) { + if (rows === -1 || columns === -1) { + appDisplay._grid.setGridModes(); + } else { + appDisplay._grid.setGridModes( + [{ rows, columns }] + ); + } + appDisplay._grid._setGridMode(0); + } + + appDisplay._grid._currentMode = -1; + if (opt.APP_GRID_ALLOW_CUSTOM) { + updateGrid(opt.APP_GRID_ROWS, opt.APP_GRID_COLUMNS); + } else { + appDisplay._grid.setGridModes(); + updateGrid(-1, -1); + } + appDisplay._grid.layoutManager.fixedIconSize = opt.APP_GRID_ICON_SIZE; + appDisplay._grid.layoutManager.allow_incomplete_pages = opt.APP_GRID_ALLOW_INCOMPLETE_PAGES; + + // force rebuild icons. size shouldn't be the same as the current one, otherwise can be arbitrary + appDisplay._grid.layoutManager.adaptToSize(200, 200); + appDisplay._redisplay(); + + _realizeAppDisplay(); + } +} + +//------ App Grid - DND ---------------------------------------------------------- + +function _updateAppGridDND(reset) { + if (opt.APP_GRID_ORDER && !reset) { + if (!_appSystemStateConId) + _appSystemStateConId = Shell.AppSystem.get_default().connect('app-state-changed', () => Main.overview._overview._controls._appDisplay._redisplay()); + + // deny dnd from dash to app grid + if (!_origAppDisplayAcceptDrop) + _origAppDisplayAcceptDrop = AppDisplay.AppDisplay.prototype.acceptDrop; + AppDisplay.AppDisplay.prototype.acceptDrop = function() { return false; }; + + // deny creating folders by dnd on other icon + if (!_origAppViewItemHandleDragOver) + _origAppViewItemHandleDragOver = AppDisplay.AppViewItem.prototype.handleDragOver; + AppDisplay.AppViewItem.prototype.handleDragOver = () => DND.DragMotionResult.NO_DROP; + + if (!_origAppViewItemAcceptDrop) + _origAppViewItemAcceptDrop = AppDisplay.AppViewItem.prototype.acceptDrop; + AppDisplay.AppViewItem.prototype.acceptDrop = () => false; + } else { + if (_appSystemStateConId) { + Shell.AppSystem.get_default().disconnect(_appSystemStateConId); + _appSystemStateConId = 0; + } + + if (_origAppDisplayAcceptDrop) + AppDisplay.AppDisplay.prototype.acceptDrop = _origAppDisplayAcceptDrop; + + if (_origAppViewItemHandleDragOver) + AppDisplay.AppViewItem.prototype.handleDragOver = _origAppViewItemHandleDragOver; + + if (_origAppViewItemAcceptDrop) + AppDisplay.AppViewItem.prototype.acceptDrop = _origAppViewItemAcceptDrop; + } +} + +function _realizeAppDisplay() { + // force app grid to build all icons before the first visible animation to remove possible stuttering + // let the main loop realize previous changes before continuing + + // don't do this during shell startup + if (Main.layoutManager._startingUp) + return; + + if (_updateAppGridTimeoutId) { + GLib.source_remove(_updateAppGridTimeoutId); + } + + _updateAppGridTimeoutId = GLib.timeout_add( + GLib.PRIORITY_DEFAULT, + 1000, + () => { + Main.layoutManager.overviewGroup.opacity = 1; + Main.layoutManager.overviewGroup.scale_x = 0.1; + Main.layoutManager.overviewGroup.show(); + Main.overview.dash.showAppsButton.checked = true; + + GLib.source_remove(_updateAppGridTimeoutId); + + _updateAppGridTimeoutId = GLib.timeout_add(GLib.PRIORITY_DEFAULT, + 500, + () => { + _restoreOverviewGroup(); + _updateAppGridTimeoutId = 0; + return GLib.SOURCE_REMOVE; + }); + } + ); +} + +function _restoreOverviewGroup() { + Main.overview.dash.showAppsButton.checked = false; + Main.layoutManager.overviewGroup.opacity = 255; + Main.layoutManager.overviewGroup.scale_x = 1; + Main.layoutManager.overviewGroup.hide(); +} + +//------ appDisplay - Vertical -------------------------------------------------------------------------------- + +var AppDisplayVertical = { + // correction of the appGrid size when page indicators were moved from the bottom to the right + adaptToSize: function(width, height) { + const [, indicatorWidth] = this._pageIndicators.get_preferred_width(-1); + width -= indicatorWidth; + + this._grid.findBestModeForSize(width, height); + + const adaptToSize = AppDisplay.BaseAppView.prototype.adaptToSize.bind(this); + adaptToSize(width, height); + }, +} + + +//------ AppDisplay.AppSearchProvider ---------------------------------------------------------------------------------- + +// App search result size +var AppSearchProvider = { + createResultObject: function(resultMeta) { + if (resultMeta.id.endsWith('.desktop')) { + const icon = new AppDisplay.AppIcon(this._appSys.lookup_app(resultMeta['id']), { + expandTitleOnHover: false, + }); + icon.icon.setIconSize(opt.SEARCH_ICON_SIZE); + return icon; + } else { + const icon = new AppDisplay.SystemActionIcon(this, resultMeta); + icon.icon._setSizeManually = true; + icon.icon.setIconSize(opt.SEARCH_ICON_SIZE); + return icon; + } + } +} + +var BaseAppViewVertical = { + // this fixes dnd from appDisplay to the workspace thumbnail on the left if appDisplay is on page 1 because of appgrid left overshoot + _pageForCoords: function(x, y) { + return AppDisplay.SidePages.NONE; + }, +} + +// ------ AppDisplay - Custom App Grid ------------------------------------------------------------------------ + +var AppDisplayCommon = { + _ensureDefaultFolders: function() { + // disable creation of default folders if user deleted them + }, + + // apps load adapted for custom sorting and including dash items + _loadApps: function() { + let appIcons = []; + this._appInfoList = Shell.AppSystem.get_default().get_installed().filter(appInfo => { + try { + appInfo.get_id(); // catch invalid file encodings + } catch (e) { + return false; + } + return (opt.APP_GRID_INCLUDE_DASH || !this._appFavorites.isFavorite(appInfo.get_id())) && + this._parentalControlsManager.shouldShowApp(appInfo); + }); + + let apps = this._appInfoList.map(app => app.get_id()); + + let appSys = Shell.AppSystem.get_default(); + + const appsInsideFolders = new Set(); + this._folderIcons = []; + if (!opt.APP_GRID_ORDER) { + + let folders = this._folderSettings.get_strv('folder-children'); + folders.forEach(id => { + let path = `${this._folderSettings.path}folders/${id}/`; + let icon = this._items.get(id); + if (!icon) { + icon = new AppDisplay.FolderIcon(id, path, this); + icon.connect('apps-changed', () => { + this._redisplay(); + this._savePages(); + }); + icon.connect('notify::pressed', () => { + if (icon.pressed) + this.updateDragFocus(icon); + }); + } + + // Don't try to display empty folders + if (!icon.visible) { + icon.destroy(); + return; + } + + appIcons.push(icon); + this._folderIcons.push(icon); + + icon.getAppIds().forEach(appId => appsInsideFolders.add(appId)); + }); + } + + // Allow dragging of the icon only if the Dash would accept a drop to + // change favorite-apps. There are no other possible drop targets from + // the app picker, so there's no other need for a drag to start, + // at least on single-monitor setups. + // This also disables drag-to-launch on multi-monitor setups, + // but we hope that is not used much. + const isDraggable = + global.settings.is_writable('favorite-apps') || + global.settings.is_writable('app-picker-layout'); + + apps.forEach(appId => { + if (!opt.APP_GRID_ORDER && appsInsideFolders.has(appId)) + return; + + let icon = this._items.get(appId); + if (!icon) { + let app = appSys.lookup_app(appId); + + icon = new AppDisplay.AppIcon(app, { isDraggable }); + icon.connect('notify::pressed', () => { + if (icon.pressed) + this.updateDragFocus(icon); + }); + } + + appIcons.push(icon); + }); + + // At last, if there's a placeholder available, add it + if (this._placeholder) + appIcons.push(this._placeholder); + + //const runningIDs = Shell.AppSystem.get_default().get_running().map(app => app.get_id()); + + // remove running apps + /*if (!APP_GRID_INCLUDE_DASH) { // !icon.app means folder + appIcons = appIcons.filter((icon) => this._folderIcons.includes(icon) || !(runningIDs.includes(icon.app.id) || this._appFavorites.isFavorite(icon.id))); + }*/ + + return appIcons; + }, +} + +var BaseAppView = { + // adds sorting options and option to add favorites and running apps + _redisplay: function() { + let oldApps = this._orderedItems.slice(); + let oldAppIds = oldApps.map(icon => icon.id); + + let newApps = this._loadApps().sort(this._compareItems.bind(this)); + let newAppIds = newApps.map(icon => icon.id); + + let addedApps = newApps.filter(icon => !oldAppIds.includes(icon.id)); + let removedApps = oldApps.filter(icon => !newAppIds.includes(icon.id)); + + // Remove old app icons + removedApps.forEach(icon => { + this._removeItem(icon); + icon.destroy(); + }); + + // Add new app icons, or move existing ones + newApps.forEach(icon => { + const [page, position] = this._getItemPosition(icon); + if (addedApps.includes(icon)) + this._addItem(icon, page, position); + else if (page !== -1 && position !== -1) { + this._moveItem(icon, page, position); + } + + }); + + // Reorder App Grid by usage + // sort all alphabetically + if(opt.APP_GRID_ORDER > 0) { + const { itemsPerPage } = this._grid; + let appIcons = this._orderedItems; + appIcons.sort((a, b) => a.name.toLowerCase().localeCompare(b.name.toLowerCase())); + // then sort used apps by usage + if (opt.APP_GRID_ORDER === 2) { + appIcons.sort((a, b) => Shell.AppUsage.get_default().compare(a.app.id, b.app.id)); + } + // sort favorites first + if (opt.APP_GRID_INCLUDE_DASH === 2) { + const fav = Object.keys(this._appFavorites._favorites); + appIcons.sort((a, b) => { + let aFav = fav.indexOf(a.id); + if (aFav < 0) aFav = 999; + let bFav = fav.indexOf(b.id); + if (bFav < 0) bFav = 999; + return bFav < aFav; + }); + } + + // sort running first + if (opt.APP_GRID_INCLUDE_DASH === 2) { + appIcons.sort((a, b) => a.app.get_state() !== Shell.AppState.RUNNING && b.app.get_state() === Shell.AppState.RUNNING); + } + + appIcons.forEach((icon, i) => { + const page = Math.floor(i / itemsPerPage); + const position = i % itemsPerPage; + this._moveItem(icon, page, position); + }); + + this._orderedItems = appIcons; + } + + this.emit('view-loaded'); + }, + + _canAccept: function(source) { + return (opt.APP_GRID_ORDER ? false : source instanceof AppDisplay.AppViewItem); + }, + + // GS <= 42 only, Adapt app grid so it can use all available space + adaptToSize(width, height) { + let box = new Clutter.ActorBox({ + x2: width, + y2: height, + }); + box = this.get_theme_node().get_content_box(box); + box = this._scrollView.get_theme_node().get_content_box(box); + box = this._grid.get_theme_node().get_content_box(box); + + const availWidth = box.get_width(); + const availHeight = box.get_height(); + + const gridRatio = this._grid.layout_manager.columnsPerPage / + this._grid.layout_manager.rowsPerPage; + const spaceRatio = availWidth / availHeight; + let pageWidth, pageHeight; + + if (spaceRatio > gridRatio * 1.1) { + // Enough room for some preview + pageHeight = availHeight; + pageWidth = Math.ceil(availHeight * gridRatio); + + if (spaceRatio > gridRatio * 1.5) { + // Ultra-wide layout, give some extra space for + // the page area, but up to an extent. + const extraPageSpace = Math.min( + Math.floor((availWidth - pageWidth) / 2), 200); // AppDisplay.MAX_PAGE_PADDING == 200 + pageWidth += extraPageSpace; + this._grid.layout_manager.pagePadding.left = + Math.floor(extraPageSpace / 2); + this._grid.layout_manager.pagePadding.right = + Math.ceil(extraPageSpace / 2); + } + } else { + // Not enough room, needs to shrink horizontally + pageWidth = Math.ceil(availWidth * 0.95); // width limiter, original is 0.8 + pageHeight = availHeight; + this._grid.layout_manager.pagePadding.left = + Math.floor(availWidth * 0.02); + this._grid.layout_manager.pagePadding.right = + Math.ceil(availWidth * 0.02); + } + + this._grid.adaptToSize(pageWidth, pageHeight); + + const leftPadding = Math.floor( + (availWidth - this._grid.layout_manager.pageWidth) / 2); + const rightPadding = Math.ceil( + (availWidth - this._grid.layout_manager.pageWidth) / 2); + const topPadding = Math.floor( + (availHeight - this._grid.layout_manager.pageHeight) / 2); + const bottomPadding = Math.ceil( + (availHeight - this._grid.layout_manager.pageHeight) / 2); + + this._scrollView.content_padding = new Clutter.Margin({ + left: leftPadding, + right: rightPadding, + top: topPadding, + bottom: bottomPadding, + }); + + this._availWidth = availWidth; + this._availHeight = availHeight; + + this._pageIndicatorOffset = leftPadding; + this._pageArrowOffset = Math.max( + leftPadding - 80, 0); // 80 is AppDisplay.PAGE_PREVIEW_MAX_ARROW_OFFSET + } +} + +var BaseAppViewGridLayout = { + _getIndicatorsWidth(box) { + const [width, height] = box.get_size(); + const arrows = [ + this._nextPageArrow, + this._previousPageArrow, + ]; + + const minArrowsWidth = arrows.reduce( + (previousWidth, accessory) => { + const [min] = accessory.get_preferred_width(height); + return Math.max(previousWidth, min); + }, 0); + + const idealIndicatorWidth = (width * 0.1/*PAGE_PREVIEW_RATIO*/) / 2; + + return Math.max(idealIndicatorWidth, minArrowsWidth); + } +} + +// ------------------ AppDisplay.AppFolderDialog - injection -------------------------------------------------------------- + +var AppFolderDialogInjections = { + _init: function() { + const iconSize = opt.APP_GRID_FOLDER_ICON_SIZE < 0 ? 96 : opt.APP_GRID_FOLDER_ICON_SIZE; + let width = opt.APP_GRID_FOLDER_COLUMNS * (iconSize + 64); + width = Math.max(640, Math.round(width + width / 10)); + let height = opt.APP_GRID_FOLDER_ROWS * (iconSize + 64) + 150; + opt.APP_GRID_ALLOW_CUSTOM && this.child.set_style(` + width: ${width}px; + height: ${height}px; + padding: 30px; + `); + } +} + + +// ------------------ AppDisplay.FolderGrid ----------------------------------------------------------------------- + +var FolderView = { + _createGrid: function() { + let grid; + if (shellVersion < 43) { + grid = new FolderGrid(); + } else { + grid = new FolderGrid43(); + } + return grid; + } +} + +// folder columns and rows + +var FolderGrid = GObject.registerClass( +class FolderGrid extends IconGrid.IconGrid { + _init() { + super._init({ + allow_incomplete_pages: false, + columns_per_page: opt.APP_GRID_ALLOW_CUSTOM ? opt.APP_GRID_FOLDER_COLUMNS : 3, + rows_per_page: opt.APP_GRID_ALLOW_CUSTOM ? opt.APP_GRID_FOLDER_ROWS : 3, + page_halign: Clutter.ActorAlign.CENTER, + page_valign: Clutter.ActorAlign.CENTER, + }); + + opt.APP_GRID_ALLOW_CUSTOM && this.set_style('column-spacing: 10px; row-spacing: 10px;'); + this.layout_manager.fixedIconSize = opt.APP_GRID_FOLDER_ICON_SIZE; + } + + adaptToSize(width, height) { + this.layout_manager.adaptToSize(width, height); + } +}); + + +// only the first access to the const AppDisplay.AppGrid throws an error, so touch it before it's really needed +let FolderGrid43; +AppDisplay.AppGrid; +if (AppDisplay.AppGrid) { + FolderGrid43 = GObject.registerClass( + class FolderGrid43 extends AppDisplay.AppGrid { + _init() { + super._init({ + allow_incomplete_pages: false, + columns_per_page: opt.APP_GRID_ALLOW_CUSTOM ? opt.APP_GRID_FOLDER_COLUMNS : 3, + rows_per_page: opt.APP_GRID_ALLOW_CUSTOM ? opt.APP_GRID_FOLDER_ROWS : 3, + page_halign: Clutter.ActorAlign.CENTER, + page_valign: Clutter.ActorAlign.CENTER, + }); + + opt.APP_GRID_ALLOW_CUSTOM && this.set_style('column-spacing: 10px; row-spacing: 10px;'); + this.layout_manager.fixedIconSize = opt.APP_GRID_FOLDER_ICON_SIZE; + + this.setGridModes([ + { + rows: opt.APP_GRID_ALLOW_CUSTOM ? opt.APP_GRID_FOLDER_ROWS : 3, + columns: opt.APP_GRID_ALLOW_CUSTOM ? opt.APP_GRID_FOLDER_COLUMNS : 3, + }, + ]); + } + + adaptToSize(width, height) { + this.layout_manager.adaptToSize(width, height); + } + }); + +} + +var FOLDER_DIALOG_ANIMATION_TIME = 200; // AppDisplay.FOLDER_DIALOG_ANIMATION_TIME +var AppFolderDialog = { + _zoomAndFadeIn: function() { + let [sourceX, sourceY] = + this._source.get_transformed_position(); + let [dialogX, dialogY] = + this.child.get_transformed_position(); + + this.child.set({ + translation_x: sourceX - dialogX, + translation_y: sourceY - dialogY, + scale_x: this._source.width / this.child.width, + scale_y: this._source.height / this.child.height, + opacity: 0, + }); + + this.ease({ + background_color: Clutter.Color.from_pixel(0x00000033), // DIALOG_SHADE_NORMAL + duration: FOLDER_DIALOG_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + + + this.child.ease({ + translation_x: 0, + translation_y: 0, + scale_x: 1, + scale_y: 1, + opacity: 255, + duration: FOLDER_DIALOG_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + + this._needsZoomAndFade = false; + + if (this._sourceMappedId === 0) { + this._sourceMappedId = this._source.connect( + 'notify::mapped', this._zoomAndFadeOut.bind(this)); + } + }, +} + +function _resetAppGrid(settings = null, key = null) { + if (settings) { + const currentValue = JSON.stringify(settings.get_value('app-picker-layout').deep_unpack()); + const emptyValue = JSON.stringify([]); + if (key === 'app-picker-layout' && currentValue != emptyValue) + return; + } + const appDisplay = Main.overview._overview._controls._appDisplay; + const items = appDisplay._orderedItems; + for (let i = items.length - 1; i > -1; i--) { + Main.overview._overview._controls._appDisplay._removeItem(items[i]); + } + // redisplay only from callback + if (settings) + appDisplay._redisplay(); +} + +// ------------------ AppDisplay.AppIcon - override --------------------------------------------------------------- + +function _getWindowApp(metaWin) { + const tracker = Shell.WindowTracker.get_default(); + return tracker.get_window_app(metaWin); +} + +function _getAppLastUsedWindow(app) { + let recentWin; + global.display.get_tab_list(Meta.TabList.NORMAL_ALL, null).forEach(metaWin => { + const winApp = _getWindowApp(metaWin); + if (!recentWin && winApp == app) { + recentWin = metaWin; + } + }); + return recentWin; +} + +function _getAppRecentWorkspace(app) { + const recentWin = _getAppLastUsedWindow(app) + if (recentWin) + return recentWin.get_workspace(); + + return null; +} + +var AppIcon = { + activate: function(button) { + const event = Clutter.get_current_event(); + const modifiers = event ? event.get_state() : 0; + const isMiddleButton = button && button == Clutter.BUTTON_MIDDLE; + const isCtrlPressed = (modifiers & Clutter.ModifierType.CONTROL_MASK) != 0; + const isShiftPressed = (modifiers & Clutter.ModifierType.SHIFT_MASK) != 0; + const openNewWindow = this.app.can_open_new_window() && + this.app.state == Shell.AppState.RUNNING && + (isCtrlPressed || isMiddleButton); + + const currentWS = global.workspace_manager.get_active_workspace(); + const appRecentWorkspace = _getAppRecentWorkspace(this.app); + + let targetWindowOnCurrentWs = false; + if (opt.DASH_FOLLOW_RECENT_WIN) { + targetWindowOnCurrentWs = appRecentWorkspace === currentWS; + } else { + this.app.get_windows().forEach( + w => targetWindowOnCurrentWs = targetWindowOnCurrentWs || (w.get_workspace() === currentWS) + ); + } + + if ((this.app.state == Shell.AppState.STOPPED || openNewWindow) && !isShiftPressed) + this.animateLaunch(); + + if (openNewWindow) { + this.app.open_new_window(-1); + // if the app has more than one window (option: and has no window on the current workspace), + // don't activate the app, only move the overview to the workspace with the app's recent window + } else if (opt.DASH_SHOW_WINS_BEFORE && !isShiftPressed && this.app.get_n_windows() > 1 && !targetWindowOnCurrentWs) { + this._scroll = true; + this._scrollTime = Date.now(); + //const appWS = this.app.get_windows()[0].get_workspace(); + Main.wm.actionMoveWorkspace(appRecentWorkspace); + Main.overview.dash.showAppsButton.checked = false; + return; + } else if (opt.DASH_SHIFT_CLICK_MV && isShiftPressed && this.app.get_windows().length) { + this._moveAppToCurrentWorkspace(); + return; + } else if (isShiftPressed) { + return; + } else { + this.app.activate(); + } + + Main.overview.hide(); + }, + + _moveAppToCurrentWorkspace: function() { + this.app.get_windows().forEach(w => w.change_workspace(global.workspace_manager.get_active_workspace())); + }, + + popupMenu: function(side = St.Side.LEFT) { + if (shellVersion >= 42) + this.setForcedHighlight(true); + this._removeMenuTimeout(); + this.fake_release(); + + if (!this._getWindowsOnCurrentWs) { + this._getWindowsOnCurrentWs = function() { + const winList = []; + this.app.get_windows().forEach(w => { + if(w.get_workspace() === global.workspace_manager.get_active_workspace()) winList.push(w) + }); + return winList; + }; + + this._windowsOnOtherWs = function() { + return (this.app.get_windows().length - this._getWindowsOnCurrentWs().length) > 0; + }; + } + + if (!this._menu) { + this._menu = new AppMenu(this, side, { + favoritesSection: true, + showSingleWindows: true, + }); + + this._menu.setApp(this.app); + this._openSigId = this._menu.connect('open-state-changed', (menu, isPoppedUp) => { + if (!isPoppedUp) + this._onMenuPoppedDown(); + }); + //Main.overview.connectObject('hiding', + this._hidingSigId = Main.overview.connect('hiding', + () => this._menu.close(), this); + + Main.uiGroup.add_actor(this._menu.actor); + this._menuManager.addMenu(this._menu); + } + + // once the menu is created, it stays unchanged and we need to modify our items based on current situation + if (this._addedMenuItems && this._addedMenuItems.length) { + this._addedMenuItems.forEach(i => i.destroy()); + } + + const popupItems =[]; + + const separator = new PopupMenu.PopupSeparatorMenuItem(); + this._menu.addMenuItem(separator); + + if (this.app.get_n_windows()) { + if (/*opt.APP_MENU_FORCE_QUIT*/true) { + popupItems.push([_('Force Quit'), () => { + this.app.get_windows()[0].kill(); + }]); + } + + if (/*opt.APP_MENU_CLOSE_WS*/true) { + const nWin = this._getWindowsOnCurrentWs().length; + if (nWin) { + popupItems.push([_(`Close ${nWin} Windows on Current Workspace`), () => { + const windows = this._getWindowsOnCurrentWs(); + let time = global.get_current_time(); + for (let win of windows) { + // increase time by 1 ms for each window to avoid errors from GS + win.delete(time++); + } + }]); + } + } + + if (/*opt.APP_MENU_MV_TO_WS && */this._windowsOnOtherWs()) { + popupItems.push([_('Move App to Current Workspace'), this._moveAppToCurrentWorkspace]); + } + } + + this._addedMenuItems = []; + this._addedMenuItems.push(separator); + popupItems.forEach(i => { + let item = new PopupMenu.PopupMenuItem(i[0]); + this._menu.addMenuItem(item); + item.connect('activate', i[1].bind(this)); + this._addedMenuItems.push(item); + }); + + this.emit('menu-state-changed', true); + + this._menu.open(BoxPointer.PopupAnimation.FULL); + this._menuManager.ignoreRelease(); + this.emit('sync-tooltip'); + + return false; + } +} diff --git a/extensions/vertical-workspaces/dash.js b/extensions/vertical-workspaces/dash.js new file mode 100644 index 0000000..c4e3101 --- /dev/null +++ b/extensions/vertical-workspaces/dash.js @@ -0,0 +1,829 @@ +/** + * Vertical Workspaces + * dash.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022-2023 + * @license GPL-3.0 + * modified dash module of https://github.com/RensAlthuis/vertical-overview extension + */ + +const { Clutter, GLib, GObject, Graphene, Meta, Shell, St } = imports.gi; +const AppDisplay = imports.ui.appDisplay; +const AppFavorites = imports.ui.appFavorites; +const DND = imports.ui.dnd; +const IconGrid = imports.ui.iconGrid; +const Main = imports.ui.main; +const Overview = imports.ui.overview; +const Dash = imports.ui.dash; +const { DashIcon, DashItemContainer, getAppFromSource, DragPlaceholderItem } = imports.ui.dash; + +const Me = imports.misc.extensionUtils.getCurrentExtension(); +const Util = Me.imports.util; +const _ = Me.imports.settings._; + +let verticalOverrides = {}; +let _origWorkId; +let _newWorkId; +let _showAppsIconBtnPressId; + +// added values to achieve better ability to scale down according the available space +var BaseIconSizes = [16, 24, 32, 40, 44, 48, 56, 64, 72, 80, 96, 112, 128]; + +const RecentFilesSearchProviderPrefix = Me.imports.recentFilesSearchProvider.prefix; +const WindowSearchProviderPrefix = Me.imports.windowSearchProvider.prefix; + +let _overrides; + +const DASH_ITEM_LABEL_SHOW_TIME = 150; + +let opt; + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + opt = Me.imports.settings.opt; + const dash = Main.overview._overview._controls.layoutManager._dash; + + setToHorizontal(); + + dash.remove_style_class_name("vertical-overview"); + dash.remove_style_class_name("vertical-overview-left"); + dash.remove_style_class_name("vertical-overview-right"); + + if (reset) { + _moveDashAppGridIcon(reset); + _connectShowAppsIcon(reset); + _updateSearchWindowsIcon(false); + _updateRecentFilesIcon(false); + dash.visible = true; + dash._background.opacity = 255; + _overrides = null; + opt = null; + return; + } + + _overrides = new Util.Overrides(); + + _overrides.addOverride('DashItemContainer', Dash.DashItemContainer.prototype, DashItemContainerOverride); + _overrides.addOverride('DashCommon', Dash.Dash.prototype, DashCommonOverride); + + if (opt.DASH_VERTICAL) { + _overrides.addOverride('Dash', Dash.Dash.prototype, DashOverride); + setToVertical(); + dash.add_style_class_name("vertical-overview"); + + if (!_newWorkId) { + _origWorkId = dash._workId; + dash._workId = Main.initializeDeferredWork(dash._box, dash._redisplay.bind(dash)); + _newWorkId = dash._workId; + } else { + dash._workId = _newWorkId; + } + } else { + setToHorizontal(); + if (_origWorkId) + dash._workId = _origWorkId; + } + + _updateSearchWindowsIcon(); + _updateRecentFilesIcon(); + _moveDashAppGridIcon(); + _connectShowAppsIcon(); + + if (dash._showWindowsIcon && !dash._showWindowsIconClickedId) { + dash._showWindowsIconClickedId = dash._showWindowsIcon.toggleButton.connect('clicked', (a, c) => c && Util.activateSearchProvider(WindowSearchProviderPrefix)); + } + if (dash._recentFilesIcon && !dash._recentFilesIconClickedId) { + dash._recentFilesIconClickedId = dash._recentFilesIcon.toggleButton.connect('clicked', (a, c) => c && Util.activateSearchProvider(RecentFilesSearchProviderPrefix)); + } + Main.overview.dash._redisplay(); + Main.overview._overview._controls.layoutManager._dash.visible = opt.DASH_VISIBLE; +} + +function setToVertical() { + let dash = Main.overview._overview._controls.layoutManager._dash; + + dash._box.layout_manager.orientation = Clutter.Orientation.VERTICAL; + dash._dashContainer.layout_manager.orientation = Clutter.Orientation.VERTICAL; + dash._dashContainer.y_expand = false; + dash._dashContainer.x_expand = true; + dash.x_align = Clutter.ActorAlign.START; + dash.y_align = Clutter.ActorAlign.CENTER; + + let sizerBox = dash._background.get_children()[0]; + sizerBox.clear_constraints(); + sizerBox.add_constraint(new Clutter.BindConstraint({ + source: dash._showAppsIcon.icon, + coordinate: Clutter.BindCoordinate.WIDTH, + })); + sizerBox.add_constraint(new Clutter.BindConstraint({ + source: dash._dashContainer, + coordinate: Clutter.BindCoordinate.HEIGHT, + })); + dash._box.remove_all_children(); + dash._separator = null; + dash._queueRedisplay(); + dash._adjustIconSize(); + + dash.add_style_class_name(opt.DASH_LEFT ? 'vertical-overview-left' : 'vertical-overview-right'); +} + +function setToHorizontal() { + let dash = Main.overview._overview._controls.layoutManager._dash; + if (_origWorkId) + dash._workId = _origWorkId; //pretty sure this is a leak, but there no provided way to disconnect these... + dash._box.layout_manager.orientation = Clutter.Orientation.HORIZONTAL; + dash._dashContainer.layout_manager.orientation = Clutter.Orientation.HORIZONTAL; + dash._dashContainer.y_expand = true; + dash._dashContainer.x_expand = false; + dash.x_align = Clutter.ActorAlign.CENTER; + dash.y_align = 0; + + let sizerBox = dash._background.get_children()[0]; + sizerBox.clear_constraints(); + sizerBox.add_constraint(new Clutter.BindConstraint({ + source: dash._showAppsIcon.icon, + coordinate: Clutter.BindCoordinate.HEIGHT, + })); + sizerBox.add_constraint(new Clutter.BindConstraint({ + source: dash._dashContainer, + coordinate: Clutter.BindCoordinate.WIDTH, + })); + + dash._box.remove_all_children(); + dash._separator = null; + dash._queueRedisplay(); + dash._adjustIconSize(); +} + +function _moveDashAppGridIcon(reset = false) { + // move dash app grid icon to the front + const dash = Main.overview._overview._controls.layoutManager._dash; + + const appIconPosition = opt.get('showAppsIconPosition', true); + dash._showAppsIcon.remove_style_class_name('show-apps-icon-vertical-hide'); + dash._showAppsIcon.remove_style_class_name('show-apps-icon-horizontal-hide'); + dash._showAppsIcon.opacity = 255; + if (!reset && appIconPosition === 0) // 0 - start + dash._dashContainer.set_child_at_index(dash._showAppsIcon, 0); + if (reset || appIconPosition === 1) { // 1 - end + const index = dash._dashContainer.get_children().length - 1; + dash._dashContainer.set_child_at_index(dash._showAppsIcon, index); + } + if (!reset && appIconPosition === 2) {// 2 - hide + const style = opt.DASH_VERTICAL ? 'show-apps-icon-vertical-hide' : 'show-apps-icon-horizontal-hide'; + dash._showAppsIcon.add_style_class_name(style); + // for some reason even if the icon height in vertical mode should be set to 0 by the style, it stays visible in full size returning height 1px + dash._showAppsIcon.opacity = 0; + } +} + +function _connectShowAppsIcon(reset = false) { + if (!reset) { + if (_showAppsIconBtnPressId || Util.dashIsDashToDock()) { + // button is already connected || dash is Dash to Dock + return; + } + + Main.overview.dash._showAppsIcon.reactive = true; + _showAppsIconBtnPressId = Main.overview.dash._showAppsIcon.connect('button-press-event', (actor, event) => { + const button = event.get_button(); + if (button === Clutter.BUTTON_MIDDLE) { + Util.openPreferences(); + } else if (button === Clutter.BUTTON_SECONDARY) { + Util.activateSearchProvider(WindowSearchProviderPrefix); + } else { + return Clutter.EVENT_PROPAGATE; + } + }); + } else { + if (_showAppsIconBtnPressId) { + Main.overview.dash._showAppsIcon.disconnect(_showAppsIconBtnPressId); + _showAppsIconBtnPressId = 0; + Main.overview.dash._showAppsIcon.reactive = false; + } + } +} + +var DashOverride = { + handleDragOver: function (source, actor, _x, y, _time) { + let app = getAppFromSource(source); + + // Don't allow favoriting of transient apps + if (app == null || app.is_window_backed()) + return DND.DragMotionResult.NO_DROP; + + if (!global.settings.is_writable('favorite-apps')) + return DND.DragMotionResult.NO_DROP; + + let favorites = AppFavorites.getAppFavorites().getFavorites(); + let numFavorites = favorites.length; + + let favPos = favorites.indexOf(app); + + let children = this._box.get_children(); + let numChildren = children.length; + let boxHeight = this._box.height; + + // Keep the placeholder out of the index calculation; assuming that + // the remove target has the same size as "normal" items, we don't + // need to do the same adjustment there. + if (this._dragPlaceholder) { + boxHeight -= this._dragPlaceholder.height; + numChildren--; + } + + // Same with the separator + if (this._separator) { + boxHeight -= this._separator.height; + numChildren--; + } + + let pos; + if (!this._emptyDropTarget) + pos = Math.floor(y * numChildren / boxHeight); + else + pos = 0; // always insert at the top when dash is empty + + // Put the placeholder after the last favorite if we are not + // in the favorites zone + if (pos > numFavorites) + pos = numFavorites; + + if (pos !== this._dragPlaceholderPos && this._animatingPlaceholdersCount === 0) { + this._dragPlaceholderPos = pos; + + // Don't allow positioning before or after self + if (favPos != -1 && (pos == favPos || pos == favPos + 1)) { + this._clearDragPlaceholder(); + return DND.DragMotionResult.CONTINUE; + } + + // If the placeholder already exists, we just move + // it, but if we are adding it, expand its size in + // an animation + let fadeIn; + if (this._dragPlaceholder) { + this._dragPlaceholder.destroy(); + fadeIn = false; + } else { + fadeIn = true; + } + + this._dragPlaceholder = new DragPlaceholderItem(); + this._dragPlaceholder.child.set_width(this.iconSize / 2); + this._dragPlaceholder.child.set_height(this.iconSize); + this._box.insert_child_at_index(this._dragPlaceholder, + this._dragPlaceholderPos); + this._dragPlaceholder.show(fadeIn); + } + + if (!this._dragPlaceholder) + return DND.DragMotionResult.NO_DROP; + + let srcIsFavorite = favPos != -1; + + if (srcIsFavorite) + return DND.DragMotionResult.MOVE_DROP; + + return DND.DragMotionResult.COPY_DROP; + }, + + _redisplay: function () { + let favorites = AppFavorites.getAppFavorites().getFavoriteMap(); + + let running = this._appSystem.get_running(); + + let children = this._box.get_children().filter(actor => { + return actor.child && + actor.child._delegate && + actor.child._delegate.app; + }); + // Apps currently in the dash + let oldApps = children.map(actor => actor.child._delegate.app); + // Apps supposed to be in the dash + let newApps = []; + + for (let id in favorites) + newApps.push(favorites[id]); + + for (let i = 0; i < running.length; i++) { + let app = running[i]; + if (app.get_id() in favorites) + continue; + newApps.push(app); + } + + // Figure out the actual changes to the list of items; we iterate + // over both the list of items currently in the dash and the list + // of items expected there, and collect additions and removals. + // Moves are both an addition and a removal, where the order of + // the operations depends on whether we encounter the position + // where the item has been added first or the one from where it + // was removed. + // There is an assumption that only one item is moved at a given + // time; when moving several items at once, everything will still + // end up at the right position, but there might be additional + // additions/removals (e.g. it might remove all the launchers + // and add them back in the new order even if a smaller set of + // additions and removals is possible). + // If above assumptions turns out to be a problem, we might need + // to use a more sophisticated algorithm, e.g. Longest Common + // Subsequence as used by diff. + let addedItems = []; + let removedActors = []; + + let newIndex = 0; + let oldIndex = 0; + while (newIndex < newApps.length || oldIndex < oldApps.length) { + let oldApp = oldApps.length > oldIndex ? oldApps[oldIndex] : null; + let newApp = newApps.length > newIndex ? newApps[newIndex] : null; + + // No change at oldIndex/newIndex + if (oldApp == newApp) { + oldIndex++; + newIndex++; + continue; + } + + // App removed at oldIndex + if (oldApp && !newApps.includes(oldApp)) { + removedActors.push(children[oldIndex]); + oldIndex++; + continue; + } + + // App added at newIndex + if (newApp && !oldApps.includes(newApp)) { + addedItems.push({ + app: newApp, + item: this._createAppItem(newApp), + pos: newIndex + }); + newIndex++; + continue; + } + + // App moved + let nextApp = newApps.length > newIndex + 1 + ? newApps[newIndex + 1] : null; + let insertHere = nextApp && nextApp == oldApp; + let alreadyRemoved = removedActors.reduce((result, actor) => { + let removedApp = actor.child._delegate.app; + return result || removedApp == newApp; + }, false); + + if (insertHere || alreadyRemoved) { + let newItem = this._createAppItem(newApp); + addedItems.push({ + app: newApp, + item: newItem, + pos: newIndex + removedActors.length + }); + newIndex++; + } else { + removedActors.push(children[oldIndex]); + oldIndex++; + } + } + + for (let i = 0; i < addedItems.length; i++) { + this._box.insert_child_at_index(addedItems[i].item, + addedItems[i].pos); + } + + for (let i = 0; i < removedActors.length; i++) { + let item = removedActors[i]; + + // Don't animate item removal when the overview is transitioning + // or hidden + if (Main.overview.visible && !Main.overview.animationInProgress) + item.animateOutAndDestroy(); + else + item.destroy(); + } + + this._adjustIconSize(); + + // Skip animations on first run when adding the initial set + // of items, to avoid all items zooming in at once + + let animate = this._shownInitially && Main.overview.visible && + !Main.overview.animationInProgress; + + if (!this._shownInitially) + this._shownInitially = true; + + for (let i = 0; i < addedItems.length; i++) + addedItems[i].item.show(animate); + + // Update separator + const nFavorites = Object.keys(favorites).length; + const nIcons = children.length + addedItems.length - removedActors.length; + if (nFavorites > 0 && nFavorites < nIcons) { + // destroy the horizontal separator if it exists. + // this is incredibly janky, but I can't think of a better way atm. + if (this._separator && this._separator.height !== 1) { + this._separator.destroy(); + this._separator = null; + } + + if (!this._separator) { + this._separator = new St.Widget({ + style_class: 'dash-separator', + x_align: Clutter.ActorAlign.CENTER, + y_align: Clutter.ActorAlign.CENTER, + width: this.iconSize, + height: 1, + }); + this._box.add_child(this._separator) + } + + //FIXME: separator placement is broken (also in original dash) + let pos = nFavorites; + if (this._dragPlaceholder) + pos++; + this._box.set_child_at_index(this._separator, pos); + } else if (this._separator) { + this._separator.destroy(); + this._separator = null; + } + // Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=692744 + // Without it, StBoxLayout may use a stale size cache + this._box.queue_relayout(); + }, + + _createAppItem: function (app) { + let appIcon = new DashIcon(app); + + let indicator = appIcon._dot; + indicator.x_align = opt.DASH_LEFT ? Clutter.ActorAlign.START : Clutter.ActorAlign.END; + indicator.y_align = Clutter.ActorAlign.CENTER; + + appIcon.connect('menu-state-changed', + (o, opened) => { + this._itemMenuStateChanged(item, opened); + }); + + let item = new DashItemContainer(); + item.setChild(appIcon); + + // Override default AppIcon label_actor, now the + // accessible_name is set at DashItemContainer.setLabelText + appIcon.label_actor = null; + item.setLabelText(app.get_name()); + + appIcon.icon.setIconSize(this.iconSize); + this._hookUpLabel(item, appIcon); + + return item; + } +} + +var DashItemContainerOverride = { + // move labels according dash position + showLabel: function() { + if (!this._labelText) + return; + + this.label.set_text(this._labelText); + this.label.opacity = 0; + this.label.show(); + + let [stageX, stageY] = this.get_transformed_position(); + + const itemWidth = this.allocation.get_width(); + const itemHeight = this.allocation.get_height(); + + const labelWidth = this.label.get_width(); + const labelHeight = this.label.get_height(); + const xOffset = Math.floor((itemWidth - labelWidth) / 2); + let x = Math.clamp(stageX + xOffset, 0, global.stage.width - labelWidth); + + let node = this.label.get_theme_node(); + let y; + + if (opt.DASH_TOP) { + const yOffset = itemHeight - labelHeight + 3 * node.get_length('-y-offset'); + y = stageY + yOffset; + + } else if (opt.DASH_BOTTOM) { + const yOffset = node.get_length('-y-offset'); + y = stageY - this.label.height - yOffset; + + } else if (opt.DASH_RIGHT) { + const yOffset = Math.floor((itemHeight - labelHeight) / 2); + + const xOffset = 4; + + x = stageX - xOffset - this.label.width; + y = Math.clamp(stageY + yOffset, 0, global.stage.height - labelHeight); + + } if (opt.DASH_LEFT) { + const yOffset = Math.floor((itemHeight - labelHeight) / 2); + + const xOffset = 4; + + x = stageX + this.width + xOffset; + y = Math.clamp(stageY + yOffset, 0, global.stage.height - labelHeight); + } + + this.label.set_position(x, y); + this.label.ease({ + opacity: 255, + duration: DASH_ITEM_LABEL_SHOW_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + + this.label.set_position(x, y); + this.label.ease({ + opacity: 255, + duration: DASH_ITEM_LABEL_SHOW_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } +} + +var DashCommonOverride = { + _adjustIconSize: function () { + // For the icon size, we only consider children which are "proper" + // icons (i.e. ignoring drag placeholders) and which are not + // animating out (which means they will be destroyed at the end of + // the animation) + let iconChildren = this._box.get_children().filter(actor => { + return actor.child && + actor.child._delegate && + actor.child._delegate.icon && + !actor.animatingOut; + }); + + // add new custom icons into the calculation + if (this._showAppsIcon.visible) { + iconChildren.push(this._showAppsIcon); + } + if (this._showWindowsIcon) { + iconChildren.push(this._showWindowsIcon); + } + if (this._recentFilesIcon) { + iconChildren.push(this._recentFilesIcon); + } + + if (!iconChildren.length) return; + + if (this._maxWidth === -1 || this._maxHeight === -1) + return; + + const dashHorizontal = !opt.DASH_VERTICAL; + + const themeNode = this.get_theme_node(); + const maxAllocation = new Clutter.ActorBox({ + x1: 0, + y1: 0, + x2: dashHorizontal ? this._maxWidth : 42, // not whatever + y2: dashHorizontal ? 42 : this._maxHeight, + }); + + let maxContent = themeNode.get_content_box(maxAllocation); + + let spacing = themeNode.get_length('spacing'); + + let firstButton = iconChildren[0].child; + let firstIcon = firstButton._delegate.icon; + + if (!firstIcon.icon) return; + + // Enforce valid spacings during the size request + firstIcon.icon.ensure_style(); + const [, , iconWidth, iconHeight] = firstIcon.icon.get_preferred_size(); + const [, , buttonWidth, buttonHeight] = firstButton.get_preferred_size(); + + let availWidth, availHeight, maxIconSize; + if (dashHorizontal) { + availWidth = maxContent.x2 - maxContent.x1; + // Subtract icon padding and box spacing from the available width + availWidth -= iconChildren.length * (buttonWidth - iconWidth) + + (iconChildren.length - 1) * spacing + + 2 * this._background.get_theme_node().get_horizontal_padding(); + + availHeight = this._maxHeight; + availHeight -= this.margin_top + this.margin_bottom; + availHeight -= this._background.get_theme_node().get_vertical_padding(); + availHeight -= themeNode.get_vertical_padding(); + availHeight -= buttonHeight - iconHeight; + + maxIconSize = Math.min(availWidth / iconChildren.length, availHeight, opt.MAX_ICON_SIZE); + } else { + availWidth = this._maxWidth; + availWidth -= this._background.get_theme_node().get_horizontal_padding(); + availWidth -= themeNode.get_horizontal_padding(); + availWidth -= buttonWidth - iconWidth; + + availHeight = maxContent.y2 - maxContent.y1; + availHeight -= iconChildren.length * (buttonHeight - iconHeight) + + (iconChildren.length - 1) * spacing + + 2 * this._background.get_theme_node().get_vertical_padding(); + + maxIconSize = Math.min(availWidth, availHeight / iconChildren.length, opt.MAX_ICON_SIZE); + } + + let scaleFactor = St.ThemeContext.get_for_stage(global.stage).scale_factor; + let iconSizes = BaseIconSizes.map(s => s * scaleFactor); + + let newIconSize = BaseIconSizes[0]; + for (let i = 0; i < iconSizes.length; i++) { + if (iconSizes[i] <= maxIconSize) + newIconSize = BaseIconSizes[i]; + } + + /*if (newIconSize == this.iconSize) + return;*/ + + let oldIconSize = this.iconSize; + this.iconSize = newIconSize; + this.emit('icon-size-changed'); + + let scale = oldIconSize / newIconSize; + for (let i = 0; i < iconChildren.length; i++) { + let icon = iconChildren[i].child._delegate.icon; + + // Set the new size immediately, to keep the icons' sizes + // in sync with this.iconSize + icon.setIconSize(this.iconSize); + + // Don't animate the icon size change when the overview + // is transitioning, not visible or when initially filling + // the dash + if (!Main.overview.visible || Main.overview.animationInProgress || + !this._shownInitially) + continue; + + let [targetWidth, targetHeight] = icon.icon.get_size(); + + // Scale the icon's texture to the previous size and + // tween to the new size + icon.icon.set_size(icon.icon.width * scale, + icon.icon.height * scale); + + icon.icon.ease({ + width: targetWidth, + height: targetHeight, + duration: Dash.DASH_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } + + if (this._separator) { + this._separator.ease({ + width: dashHorizontal ? 1 : this.iconSize, + height: dashHorizontal ? this.iconSize : 1, + duration: Dash.DASH_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } + }, +} + +function _updateSearchWindowsIcon(show = opt.SHOW_WINDOWS_ICON) { + + const dash = Main.overview._overview._controls.layoutManager._dash; + const dashContainer = dash._dashContainer; + + if (dash._showWindowsIcon) { + dashContainer.remove_child(dash._showWindowsIcon); + dash._showWindowsIconClickedId && dash._showWindowsIcon.toggleButton.disconnect(dash._showWindowsIconClickedId); + dash._showWindowsIconClickedId = undefined; + dash._showWindowsIcon && dash._showWindowsIcon.destroy(); + dash._showWindowsIcon = undefined; + } + + if (!show || !opt.WINDOW_SEARCH_PROVIDER_ENABLED) return; + + if (!dash._showWindowsIcon) { + dash._showWindowsIcon = new ShowWindowsIcon(); + dash._showWindowsIcon.show(false); + dashContainer.add_child(dash._showWindowsIcon); + dash._hookUpLabel(dash._showWindowsIcon); + } + + dash._showWindowsIcon.icon.setIconSize(opt.MAX_ICON_SIZE); + if (opt.SHOW_WINDOWS_ICON === 1) { + dashContainer.set_child_at_index(dash._showWindowsIcon, 0); + } else if (opt.SHOW_WINDOWS_ICON === 2) { + index = dashContainer.get_children().length - 1; + dashContainer.set_child_at_index(dash._showWindowsIcon, index); + } + + Main.overview._overview._controls.layoutManager._dash._adjustIconSize(); +} + +var ShowWindowsIcon = GObject.registerClass( +class ShowWindowsIcon extends Dash.DashItemContainer { + _init() { + super._init(); + + this._labelText = _('Search Open Windows (Hotkey: Space)'); + this.toggleButton = new St.Button({ + style_class: 'show-apps', + track_hover: true, + can_focus: true, + toggle_mode: false, + }); + + this._iconActor = null; + this.icon = new IconGrid.BaseIcon(this.labelText, { + setSizeManually: true, + showLabel: false, + createIcon: this._createIcon.bind(this), + }); + this.icon.y_align = Clutter.ActorAlign.CENTER; + + this.toggleButton.add_actor(this.icon); + this.toggleButton._delegate = this; + + this.setChild(this.toggleButton); + } + + _createIcon(size) { + this._iconActor = new St.Icon({ + icon_name: 'focus-windows-symbolic', + icon_size: size, + style_class: 'show-apps-icon', + track_hover: true, + }); + return this._iconActor; + } +}); + +function _updateRecentFilesIcon(show = opt.SHOW_RECENT_FILES_ICON) { + + const dash = Main.overview._overview._controls.layoutManager._dash; + const dashContainer = dash._dashContainer; + + if (dash._recentFilesIcon) { + dashContainer.remove_child(dash._recentFilesIcon); + dash._recentFilesIconClickedId && dash._recentFilesIcon.toggleButton.disconnect(dash._recentFilesIconClickedId); + dash._recentFilesIconClickedId = undefined; + dash._recentFilesIcon && dash._recentFilesIcon.destroy(); + dash._recentFilesIcon = undefined; + } + + if (!show || !opt.RECENT_FILES_SEARCH_PROVIDER_ENABLED) return; + + if (!dash._recentFilesIcon) { + dash._recentFilesIcon = new ShowRecentFilesIcon(); + dash._recentFilesIcon.show(false); + dashContainer.add_child(dash._recentFilesIcon); + dash._hookUpLabel(dash._recentFilesIcon); + } + + dash._recentFilesIcon.icon.setIconSize(opt.MAX_ICON_SIZE); + if (opt.SHOW_RECENT_FILES_ICON === 1) { + dashContainer.set_child_at_index(dash._recentFilesIcon, 0); + } else if (opt.SHOW_RECENT_FILES_ICON === 2) { + index = dashContainer.get_children().length - 1; + dashContainer.set_child_at_index(dash._recentFilesIcon, index); + } + + Main.overview._overview._controls.layoutManager._dash._adjustIconSize(); +} + +var ShowRecentFilesIcon = GObject.registerClass( +class ShowRecentFilesIcon extends Dash.DashItemContainer { + _init() { + super._init(); + + this._labelText = _('Search Recent Files (Hotkey: Ctrl + Space)'); + this.toggleButton = new St.Button({ + style_class: 'show-apps', + track_hover: true, + can_focus: true, + toggle_mode: false, + }); + + this._iconActor = null; + this.icon = new IconGrid.BaseIcon(this.labelText, { + setSizeManually: true, + showLabel: false, + createIcon: this._createIcon.bind(this), + }); + this.icon.y_align = Clutter.ActorAlign.CENTER; + + this.toggleButton.add_actor(this.icon); + this.toggleButton._delegate = this; + + this.setChild(this.toggleButton); + } + + _createIcon(size) { + this._iconActor = new St.Icon({ + icon_name: 'document-open-recent-symbolic', + icon_size: size, + style_class: 'show-apps-icon', + track_hover: true, + }); + return this._iconActor; + } +}); diff --git a/extensions/vertical-workspaces/extension.js b/extensions/vertical-workspaces/extension.js new file mode 100644 index 0000000..dc05349 --- /dev/null +++ b/extensions/vertical-workspaces/extension.js @@ -0,0 +1,564 @@ +/** + * Vertical Workspaces + * extension.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { GLib, GObject, Meta, Shell, St } = imports.gi; + +const Main = imports.ui.main; + +const Util = imports.misc.util; +const Background = imports.ui.background; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); +const Settings = Me.imports.settings; +const _Util = Me.imports.util; + +const WindowSearchProvider = Me.imports.windowSearchProvider; +const RecentFilesSearchProvider = Me.imports.recentFilesSearchProvider; +const LayoutOverride = Me.imports.layout; +const AppDisplayOverride = Me.imports.appDisplay; +const WorkspaceThumbnailOverride = Me.imports.workspaceThumbnail; +const WorkspaceOverride = Me.imports.workspace; +const WorkspacesViewOverride = Me.imports.workspacesView; +const WindowPreviewOverride = Me.imports.windowPreview; +const IconGridOverride = Me.imports.iconGrid; +const WorkspaceAnimationOverride = Me.imports.workspaceAnimation; +const WindowManagerOverride = Me.imports.windowManager; +const OverviewOverride = Me.imports.overview; +const OverviewControlsOverride = Me.imports.overviewControls; +const SwipeTrackerOverride = Me.imports.swipeTracker; +const WorkspaceSwitcherPopupOverride = Me.imports.workspaceSwitcherPopup; +const SearchOverride = Me.imports.search; +const PanelOverride = Me.imports.panel; +const DashOverride = Me.imports.dash; + + +let opt = null; + +let _bgManagers; +let _shellSettings; + +let _enabled; +let _resetExtensionIfEnabled; +let _prevDash; + +let _showingOverviewConId; +let _monitorsChangedSigId; +let _watchDockSigId; + +let _resetTimeoutId; + +// drop control for app grid sorting modes +let _appSystemStateSigId; +let _origAppViewItemAcceptDrop; +let _origAppViewItemHandleDragOver; +let _origAppDisplayAcceptDrop; + +let _enableTimeoutId = 0; + + + +function init() { + ExtensionUtils.initTranslations(); +} + +function enable() { + // globally readable flag for other extensions + global.verticalWorkspacesEnabled = true; + + _enableTimeoutId = GLib.timeout_add( + GLib.PRIORITY_DEFAULT, + 200, + () => { + activate(); + log(`${Me.metadata.name}: enabled`); + _enableTimeoutId = 0; + return GLib.SOURCE_REMOVE; + } + ); +} + +function disable() { + if (_enableTimeoutId) { + GLib.source_remove(_enableTimeoutId); + _enableTimeoutId = 0; + } else { + reset(); + } + global.verticalWorkspacesEnabled = undefined; + log(`${Me.metadata.name}: disabled`); +} + +//------------------------------------------------------------------------------------------ + +function activate() { + _enabled = true; + + _bgManagers = []; + + Settings.opt = new Settings.Options(); + opt = Settings.opt; + + _updateSettings(); + + opt.connect('changed', _updateSettings); + + _updateOverrides(); + + _prevDash = {}; + const dash = Main.overview.dash; + _prevDash.dash = dash; + _prevDash.position = dash.position; + + _monitorsChangedSigId = Main.layoutManager.connect('monitors-changed', () => _resetExtension(3000)); + + // static bg animations conflict with startup animation + // enable it on first hiding from the overview and disconnect the signal + _showingOverviewConId = Main.overview.connect('showing', _onShowingOverview); + + // if Dash to Dock detected force enable "Fix for DtD" option + if (_Util.dashIsDashToDock()) { + opt.set('fixUbuntuDock', true); + _fixUbuntuDock(true); + } else { + _fixUbuntuDock(opt.get('fixUbuntuDock')); + } + + // switch PageUp/PageDown workspace switcher shortcuts + _switchPageShortcuts(); + _setStaticBackground(!opt.SHOW_BG_IN_OVERVIEW); +} + +function reset() { + _enabled = 0; + + _fixUbuntuDock(false); + + const reset = true; + _updateOverrides(reset); + + if (_monitorsChangedSigId) { + Main.layoutManager.disconnect(_monitorsChangedSigId); + _monitorsChangedSigId = 0; + } + + _prevDash = null; + + // switch PageUp/PageDown workspace switcher shortcuts + _switchPageShortcuts(); + + _setStaticBackground(reset); + + // remove any position offsets from dash and ws thumbnails + if (!_Util.dashNotDefault()) { + Main.overview.dash.translation_x = 0; + Main.overview.dash.translation_y = 0; + } + Main.overview._overview._controls._thumbnailsBox.translation_x = 0; + Main.overview._overview._controls._thumbnailsBox.translation_y = 0; + Main.overview._overview._controls._searchEntryBin.translation_y = 0; + + Main.overview._overview._controls.set_child_above_sibling(Main.overview._overview._controls._workspacesDisplay, null); + + if (_showingOverviewConId) { + Main.overview.disconnect(_showingOverviewConId); + _showingOverviewConId = 0; + } + + St.Settings.get().slow_down_factor = 1; + + Main.overview.dash._background.set_style(''); + + opt.destroy(); + opt = null; +} + +function _updateOverrides(reset = false) { + WorkspacesViewOverride.update(reset); + WorkspaceThumbnailOverride.update(reset); + OverviewControlsOverride.update(reset); + OverviewOverride.update(reset); + + WorkspaceOverride.update(reset); + WindowPreviewOverride.update(reset); + WindowManagerOverride.update(reset); + + AppDisplayOverride.update(reset); + LayoutOverride.update(reset); + DashOverride.update(reset); + PanelOverride.update(reset); + + WorkspaceAnimationOverride.update(reset); + WorkspaceSwitcherPopupOverride.update(reset); + + SwipeTrackerOverride.update(reset); + + SearchOverride.update(reset); + WindowSearchProvider.update(reset); + RecentFilesSearchProvider.update(reset); +} + +function _onShowingOverview() { + // store pointer X coordinate for OVERVIEW_MODE 1 window spread - if mouse pointer is steady, don't spread + opt.showingPointerX = global.get_pointer()[0]; + + if (opt.FIX_UBUNTU_DOCK) { + // workaround for Ubuntu Dock breaking overview allocations after changing position + const dash = Main.overview.dash; + if (_prevDash.dash !== dash || _prevDash.position !== dash._position) { + _resetExtensionIfEnabled(0); + } + } +} + +function _resetExtension(timeout = 200) { + if (_resetTimeoutId) + GLib.source_remove(_resetTimeoutId); + _resetTimeoutId = GLib.timeout_add( + GLib.PRIORITY_DEFAULT, + timeout, + () => { + if (!_enabled) + return; + + const dash = Main.overview.dash; + if (!timeout && _prevDash.dash && dash !== _prevDash.dash) { // !timeout means DtD workaround callback + _prevDash.dash = dash; + log(`[${Me.metadata.name}]: Dash has been replaced, resetting extension...`); + reset(); + activate(); + } else if (timeout) { + log(`[${Me.metadata.name}]: resetting extension...`); + reset(); + activate(); + } + _resetTimeoutId = 0; + return GLib.SOURCE_REMOVE; + } + ); +} + +//----------------------------------------------------- + +function _fixUbuntuDock(activate = true) { + // Workaround for Ubuntu Dock breaking overview allocations after changing monitor configuration and deactivating dock + if (_shellSettings && _watchDockSigId) { + _shellSettings.disconnect(_watchDockSigId); + _watchDockSigId = 0; + } + _shellSettings = null; + + if (_resetTimeoutId) { + GLib.source_remove(_resetTimeoutId); + _resetTimeoutId = 0; + } + + _resetExtensionIfEnabled = () => {}; + + if (!activate) { + return; + } + + _shellSettings = ExtensionUtils.getSettings( 'org.gnome.shell'); + _watchDockSigId = _shellSettings.connect('changed::enabled-extensions', () => _resetExtension()); + _resetExtensionIfEnabled = _resetExtension; +} + +function _updateSettings(settings, key) { + opt._updateSettings(); + + opt.WORKSPACE_MIN_SPACING = Main.overview._overview._controls._thumbnailsBox.get_theme_node().get_length('spacing'); + // update variables that cannot be processed within settings + const dash = Main.overview.dash; + if (_Util.dashIsDashToDock()) { + opt.DASH_POSITION = dash._position; + opt.DASH_TOP = DASH_POSITION === 0; + opt.DASH_RIGHT = DASH_POSITION === 1; + opt.DASH_BOTTOM = DASH_POSITION === 2; + opt.DASH_LEFT = DASH_POSITION === 3; + opt.DASH_VERTICAL = DASH_LEFT || DASH_RIGHT; + } + + opt.MAX_ICON_SIZE = opt.get('dashMaxIconSize', true); + if (opt.MAX_ICON_SIZE < 16) { + opt.MAX_ICON_SIZE = 64; + opt.set('dashMaxIconSize', 64); + } + + imports.ui.workspace.WINDOW_PREVIEW_MAXIMUM_SCALE = 0.95; + + if (!_Util.dashIsDashToDock()) {// DtD has its own opacity control + Main.overview.dash._background.opacity = Math.round(opt.get('dashBgOpacity', true) * 2.5); // conversion % to 0-255 + const radius = opt.get('dashBgRadius', true); + if (radius) { + let style; + switch (opt.DASH_POSITION) { + case 1: + style = `border-radius: ${radius}px 0 0 ${radius}px;` + break; + case 3: + style = `border-radius: 0 ${radius}px ${radius}px 0;` + break; + default: + style = `border-radius: ${radius}px;` + } + Main.overview.dash._background.set_style(style); + } else { + Main.overview.dash._background.set_style(''); + } + } + + Main.overview.searchEntry.visible = opt.SHOW_SEARCH_ENTRY; + St.Settings.get().slow_down_factor = opt.ANIMATION_TIME_FACTOR; + imports.ui.search.MAX_LIST_SEARCH_RESULTS_ROWS = opt.SEARCH_MAX_ROWS; + opt.START_Y_OFFSET = (opt.PANEL_MODE === 1 && opt.PANEL_POSITION_TOP) ? Main.panel.height : 0; + + if (settings) + _applySettings(key); +} + +function _applySettings(key) { + _setStaticBackground(!opt.SHOW_BG_IN_OVERVIEW); + _updateOverviewTranslations(); + _switchPageShortcuts(); + + if (key === 'fix-ubuntu-dock') + _fixUbuntuDock(opt.get('fixUbuntuDock', true)); + if (key === 'ws-thumbnails-position') { + OverviewControlsOverride.update(); + WorkspaceThumbnailOverride.update(); + WorkspacesViewOverride.update(); + } + if (key?.includes('app-grid')) { + AppDisplayOverride.update(); + } + if (key?.includes('panel')) { + PanelOverride.update(); + } + if (key?.includes('dash') || key?.includes('app')) { + DashOverride.update(); + } + if (key === 'workspace-animation') { + WorkspaceAnimationOverride.update(); + } +} + +function _switchPageShortcuts() { + if (!opt.get('enablePageShortcuts', true)) + return; + + const vertical = global.workspaceManager.layout_rows === -1; + const schema = 'org.gnome.desktop.wm.keybindings'; + const settings = ExtensionUtils.getSettings(schema); + + const keyLeft = 'switch-to-workspace-left'; + const keyRight = 'switch-to-workspace-right'; + const keyUp = 'switch-to-workspace-up'; + const keyDown = 'switch-to-workspace-down'; + + const keyMoveLeft = 'move-to-workspace-left'; + const keyMoveRight = 'move-to-workspace-right'; + const keyMoveUp = 'move-to-workspace-up'; + const keyMoveDown = 'move-to-workspace-down'; + + const switchPrevSc = '<Super>Page_Up'; + const switchNextSc = '<Super>Page_Down'; + const movePrevSc = '<Super><Shift>Page_Up'; + const moveNextSc = '<Super><Shift>Page_Down'; + + let switchLeft = settings.get_strv(keyLeft); + let switchRight = settings.get_strv(keyRight); + let switchUp = settings.get_strv(keyUp); + let switchDown = settings.get_strv(keyDown); + + let moveLeft = settings.get_strv(keyMoveLeft); + let moveRight = settings.get_strv(keyMoveRight); + let moveUp = settings.get_strv(keyMoveUp); + let moveDown = settings.get_strv(keyMoveDown); + + if (vertical) { + switchLeft.includes(switchPrevSc) && switchLeft.splice(switchLeft.indexOf(switchPrevSc), 1); + switchRight.includes(switchNextSc) && switchRight.splice(switchRight.indexOf(switchNextSc), 1); + moveLeft.includes(movePrevSc) && moveLeft.splice(moveLeft.indexOf(movePrevSc), 1); + moveRight.includes(moveNextSc) && moveRight.splice(moveRight.indexOf(moveNextSc), 1); + + switchUp.includes(switchPrevSc) || switchUp.push(switchPrevSc); + switchDown.includes(switchNextSc) || switchDown.push(switchNextSc); + moveUp.includes(movePrevSc) || moveUp.push(movePrevSc); + moveDown.includes(moveNextSc) || moveDown.push(moveNextSc); + } else { + switchLeft.includes(switchPrevSc) || switchLeft.push(switchPrevSc); + switchRight.includes(switchNextSc) || switchRight.push(switchNextSc); + moveLeft.includes(movePrevSc) || moveLeft.push(movePrevSc); + moveRight.includes(moveNextSc) || moveRight.push(moveNextSc); + + switchUp.includes(switchPrevSc) && switchUp.splice(switchUp.indexOf(switchPrevSc), 1); + switchDown.includes(switchNextSc) && switchDown.splice(switchDown.indexOf(switchNextSc), 1); + moveUp.includes(movePrevSc) && moveUp.splice(moveUp.indexOf(movePrevSc), 1); + moveDown.includes(moveNextSc) && moveDown.splice(moveDown.indexOf(moveNextSc), 1); + } + + settings.set_strv(keyLeft, switchLeft); + settings.set_strv(keyRight, switchRight); + settings.set_strv(keyUp, switchUp); + settings.set_strv(keyDown, switchDown); + + settings.set_strv(keyMoveLeft, moveLeft); + settings.set_strv(keyMoveRight, moveRight); + settings.set_strv(keyMoveUp, moveUp); + settings.set_strv(keyMoveDown, moveDown); +} + + +function _shouldAnimateOverview() { + return !opt.SHOW_WS_PREVIEW_BG || opt.OVERVIEW_MODE2; +} + +function _updateOverviewTranslations(dash = null, tmbBox = null, searchEntryBin = null) { + dash = dash ?? Main.overview.dash; + tmbBox = tmbBox ?? Main.overview._overview._controls._thumbnailsBox; + searchEntryBin = searchEntryBin ?? Main.overview._overview._controls._searchEntryBin; + + if (!_shouldAnimateOverview()) { + tmbBox.translation_x = 0; + tmbBox.translation_y = 0; + dash.translation_x = 0; + dash.translation_y = 0; + searchEntryBin.translation_x = 0; + searchEntryBin.translation_y = 0; + return; + } + + const [tmbTranslation_x, tmbTranslation_y, dashTranslation_x, dashTranslation_y, searchTranslation_y] = _Util.getOverviewTranslations(opt, dash, tmbBox, searchEntryBin); + tmbBox.translation_x = tmbTranslation_x; + tmbBox.translation_y = tmbTranslation_y; + if (!_Util.dashNotDefault()) { // only if dash is not dash to dock + dash.translation_x = dashTranslation_x; + dash.translation_y = dashTranslation_y; + } + searchEntryBin.translation_y = searchTranslation_y; +} + +function _setStaticBackground(reset = false) { + _bgManagers.forEach((bg)=> { + Main.overview._overview._controls._stateAdjustment.disconnect(bg._fadeSignal); + bg.destroy(); + }); + + _bgManagers = []; + // if (!SHOW_BG_IN_OVERVIEW && SHOW_WS_PREVIEW_BG) the background is used for static transition from wallpaper to empty bg in the overview + if (reset || (!opt.SHOW_BG_IN_OVERVIEW && opt.SHOW_WS_PREVIEW_BG)) + return; + + for (const monitor of Main.layoutManager.monitors) { + const bgManager = new Background.BackgroundManager({ + monitorIndex: monitor.index, + container: Main.layoutManager.overviewGroup, + vignette: true, + }); + + bgManager.backgroundActor.content.vignette_sharpness = 0; + bgManager.backgroundActor.content.brightness = 1; + + + bgManager._fadeSignal = Main.overview._overview._controls._stateAdjustment.connect('notify::value', (v) => { + _updateStaticBackground(bgManager, v.value, v); + }); + + if (monitor.index === global.display.get_primary_monitor()) { + bgManager._primary = true; + _bgManagers.unshift(bgManager); // primary monitor first + } else { + bgManager._primary = false; + _bgManagers.push(bgManager); + } + } +} + +function _updateStaticBackground(bgManager, stateValue, stateAdjustment = null) { + if (!opt.SHOW_BG_IN_OVERVIEW && !opt.SHOW_WS_PREVIEW_BG) { + // if no bg shown in the overview, fade out the wallpaper + if (!(opt.OVERVIEW_MODE2 && opt.WORKSPACE_MODE && stateAdjustment?.getStateTransitionParams().finalState === 1)) + bgManager.backgroundActor.opacity = Util.lerp(255, 0, Math.min(stateValue, 1)); + } else { + let VIGNETTE, BRIGHTNESS, bgValue; + if (opt.OVERVIEW_MODE2 && stateValue <= 1 && !opt.WORKSPACE_MODE) { + VIGNETTE = 0; + BRIGHTNESS = 1; + bgValue = stateValue; + } else { + VIGNETTE = 0.2; + BRIGHTNESS = 0.95; + if (opt.OVERVIEW_MODE2 && stateValue > 1 && !opt.WORKSPACE_MODE) { + bgValue = stateValue - 1; + } else { + bgValue = stateValue; + } + } + + let blurEffect = bgManager.backgroundActor.get_effect('blur'); + if (!blurEffect) { + blurEffect = new Shell.BlurEffect({ + brightness: 1, + sigma: 0, + mode: Shell.BlurMode.ACTOR, + }) + bgManager.backgroundActor.add_effect_with_name('blur', blurEffect); + } + + bgManager.backgroundActor.content.vignette_sharpness = VIGNETTE; + bgManager.backgroundActor.content.brightness = BRIGHTNESS; + + let vignetteInit, brightnessInit, sigmaInit; + if (opt.SHOW_BG_IN_OVERVIEW && opt.SHOW_WS_PREVIEW_BG) { + vignetteInit = VIGNETTE; + brightnessInit = BRIGHTNESS; + sigmaInit = opt.OVERVIEW_BG_BLUR_SIGMA; + } else { + vignetteInit = 0; + brightnessInit = 1; + sigmaInit = 0 + } + + if (opt.OVERVIEW_MODE2) { + bgManager.backgroundActor.content.vignette_sharpness = Util.lerp(vignetteInit, VIGNETTE, bgValue); + bgManager.backgroundActor.content.brightness = Util.lerp(brightnessInit, BRIGHTNESS, bgValue); + } else { + bgManager.backgroundActor.content.vignette_sharpness = Util.lerp(vignetteInit, VIGNETTE, Math.min(stateValue, 1)); + bgManager.backgroundActor.content.brightness = Util.lerp(brightnessInit, BRIGHTNESS, Math.min(stateValue, 1)); + } + + if (opt.OVERVIEW_BG_BLUR_SIGMA || opt.APP_GRID_BG_BLUR_SIGMA) { + // reduce number of steps of blur transition to improve performance + const step = opt.SMOOTH_BLUR_TRANSITIONS ? 0.05 : 0.2; + const progress = stateValue - (stateValue % step); + if (opt.SHOW_WS_PREVIEW_BG && stateValue < 1) { // no need to animate transition, unless appGrid state is involved, static bg is covered by the ws preview bg + if (blurEffect.sigma !== opt.OVERVIEW_BG_BLUR_SIGMA) + blurEffect.sigma = opt.OVERVIEW_BG_BLUR_SIGMA; + } else if (stateValue < 1) { + const sigma = Math.round(Util.lerp(0, opt.OVERVIEW_BG_BLUR_SIGMA, progress)); + if (sigma !== blurEffect.sigma) { + blurEffect.sigma = sigma; + } + } else if (stateValue > 1 && bgManager._primary) { + const sigma = Math.round(Util.lerp(opt.OVERVIEW_BG_BLUR_SIGMA, opt.APP_GRID_BG_BLUR_SIGMA, progress - 1)); + if (sigma !== blurEffect.sigma) { + blurEffect.sigma = sigma; + } + } else if (stateValue === 1) { + blurEffect.sigma = opt.OVERVIEW_BG_BLUR_SIGMA; + } else if (stateValue === 0) { + blurEffect.sigma = 0; + } + } + } +} diff --git a/extensions/vertical-workspaces/iconGrid.js b/extensions/vertical-workspaces/iconGrid.js new file mode 100644 index 0000000..2b93efd --- /dev/null +++ b/extensions/vertical-workspaces/iconGrid.js @@ -0,0 +1,26 @@ +/** + * Vertical Workspaces + * iconGrid.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +// ------------------ IconGrid - override ------------------------------------------------------------------------- + +// workaround - silence page -2 error on gnome 43 during cleaning appgrid + +var IconGrid = { + getItemsAtPage: function(page) { + if (page < 0 || page > this.nPages) + return []; + //throw new Error(`Page ${page} does not exist at IconGrid`); + + const layoutManager = this.layout_manager; + return layoutManager.getItemsAtPage(page); + } +}
\ No newline at end of file diff --git a/extensions/vertical-workspaces/layout.js b/extensions/vertical-workspaces/layout.js new file mode 100644 index 0000000..29d97ad --- /dev/null +++ b/extensions/vertical-workspaces/layout.js @@ -0,0 +1,71 @@ +/** + * Vertical Workspaces + * layout.js + * + * panel barrier should follow panel position + * or disable it to not collide with Custom Hot Corners barriers + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { Meta } = imports.gi; + +const Main = imports.ui.main; +const Layout = imports.ui.layout; + +const Me = imports.misc.extensionUtils.getCurrentExtension(); +const _Util = Me.imports.util; + +let _overrides; +let opt; + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + if (reset) { + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + + _overrides = new _Util.Overrides(); + + _overrides.addOverride('LayoutManager', Layout.LayoutManager.prototype, LayoutManager); + + Main.layoutManager._updatePanelBarrier(); +} + +var LayoutManager = { + _updatePanelBarrier: function() { + if (this._rightPanelBarrier) { + this._rightPanelBarrier.destroy(); + this._rightPanelBarrier = null; + } + + // disable the barrier + return; + + if (!this.primaryMonitor) + return; + + if (this.panelBox.height) { + let primary = this.primaryMonitor; + + this._rightPanelBarrier = new Meta.Barrier({ + display: global.display, + x1: primary.x + primary.width, y1: opt.PANEL_POSITION_TOP ? primary.y : primary.y + primary.height - this.panelBox.height, + x2: primary.x + primary.width, y2: opt.PANEL_POSITION_TOP ? primary.y + this.panelBox.height : primary.y + primary.height, + directions: Meta.BarrierDirection.NEGATIVE_X, + }); + } + } +} diff --git a/extensions/vertical-workspaces/metadata.json b/extensions/vertical-workspaces/metadata.json new file mode 100644 index 0000000..ddc48be --- /dev/null +++ b/extensions/vertical-workspaces/metadata.json @@ -0,0 +1,13 @@ +{ + "name": "Vertical Workspaces", + "uuid": "vertical-workspaces@G-dH.github.com", + "description": "A extension that allows you to customize your desktop interface to suit your workflow and eyes. You can change the horizontal stacking of workspaces to vertical, but also change layout, content, appearance and behavior of Activities overview and workspace switcher.", + "shell-version": [ + "42", + "43" + ], + "url": "https://github.com/G-dH/vertical-workspaces", + "gettext-domain": "vertical-workspaces", + "settings-schema": "org.gnome.shell.extensions.vertical-workspaces", + "version": 23.5 +} diff --git a/extensions/vertical-workspaces/optionsFactory.js b/extensions/vertical-workspaces/optionsFactory.js new file mode 100644 index 0000000..bfaaec6 --- /dev/null +++ b/extensions/vertical-workspaces/optionsFactory.js @@ -0,0 +1,552 @@ +/** + * Vertical Workspaces + * optionsFactory.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + */ + +'use strict'; + +const { Gtk, Gio, GObject } = imports.gi; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); +const Settings = Me.imports.settings; + +const shellVersion = Settings.shellVersion; + +// gettext +const _ = Settings._; + +// libadwaita is available starting with GNOME Shell 42. +let Adw = null; +try { Adw = imports.gi.Adw; } catch (e) {} + +function _newImageFromIconName(name) { + return Gtk.Image.new_from_icon_name(name); +} + +var ItemFactory = class ItemFactory { + constructor(gOptions) { + this._gOptions = gOptions; + this._settings = this._gOptions._gsettings; + } + + getRowWidget(text, caption, widget, variable, options = []) { + + let item = []; + let label; + if (widget) { + label = new Gtk.Box({ + orientation: Gtk.Orientation.VERTICAL, + spacing: 4, + halign: Gtk.Align.START, + valign: Gtk.Align.CENTER, + }); + const option = new Gtk.Label({ + halign: Gtk.Align.START, + }); + option.set_text(text); + label.append(option); + + if (caption) { + const captionLabel = new Gtk.Label({ + halign: Gtk.Align.START, + wrap: true, + /*width_chars: 80,*/ + xalign: 0 + }) + const context = captionLabel.get_style_context(); + context.add_class('dim-label'); + context.add_class('caption'); + captionLabel.set_text(caption); + label.append(captionLabel); + } + label._title = text; + } else { + label = text; + } + item.push(label); + item.push(widget); + + let key; + + if (variable && this._gOptions.options[variable]) { + const opt = this._gOptions.options[variable]; + key = opt[1]; + } + + if (widget) { + if (widget._is_switch) { + this._connectSwitch(widget, key, variable); + } else if (widget._is_spinbutton || widget._is_scale) { + this._connectSpinButton(widget, key, variable); + } else if (widget._is_combo_box) { + this._connectComboBox(widget, key, variable, options); + } else if (widget._is_drop_down) { + this._connectDropDown(widget, key, variable, options); + } + } + + return item; + } + + _connectSwitch(widget, key, variable) { + this._settings.bind(key, widget, 'active', Gio.SettingsBindFlags.DEFAULT); + } + + _connectSpinButton(widget, key, variable) { + this._settings.bind(key, widget.adjustment, 'value', Gio.SettingsBindFlags.DEFAULT); + } + + _connectComboBox(widget, key, variable, options) { + let model = widget.get_model(); + widget._comboMap = {}; + const currentValue = this._gOptions.get(variable); + for (const [label, value] of options) { + let iter; + model.set(iter = model.append(), [0, 1], [label, value]); + if (value === currentValue) { + widget.set_active_iter(iter); + } + widget._comboMap[value] = iter; + } + this._gOptions.connect(`changed::${key}`, () => { + widget.set_active_iter(widget._comboMap[this._gOptions.get(variable, true)]); + }); + widget.connect('changed', () => { + const [success, iter] = widget.get_active_iter(); + + if (!success) return; + + this._gOptions.set(variable, model.get_value(iter, 1)); + }); + } + + _connectDropDown(widget, key, variable, options) { + const model = widget.get_model(); + const currentValue = this._gOptions.get(variable); + for (let i = 0; i < options.length; i++) { + const text = options[i][0]; + const id = options[i][1]; + model.append(new DropDownItem({ text, id })); + if (id === currentValue) { + widget.set_selected(i); + } + } + + const factory = new Gtk.SignalListItemFactory(); + factory.connect("setup", (factory, list_item) => { + const label = new Gtk.Label({xalign: 0}); + list_item.set_child(label); + }); + factory.connect("bind", (factory, list_item) => { + const label = list_item.get_child(); + const item = list_item.get_item(); + label.set_text(item.text); + }); + + widget.connect("notify::selected-item", (dropDown) => { + const item = dropDown.get_selected_item(); + this._gOptions.set(variable, item.id); + }); + + this._gOptions.connect(`changed::${key}`, () => { + const newId = this._gOptions.get(variable, true); + for (let i = 0; i < options.length; i++) { + const id = options[i][1]; + if (id === newId) { + widget.set_selected(i); + } + } + }); + + widget.set_factory(factory); + } + + newSwitch() { + let sw = new Gtk.Switch({ + halign: Gtk.Align.END, + valign: Gtk.Align.CENTER, + hexpand: true, + }); + sw._is_switch = true; + return sw; + } + + newSpinButton(adjustment) { + let spinButton = new Gtk.SpinButton({ + halign: Gtk.Align.END, + valign: Gtk.Align.CENTER, + hexpand: true, + vexpand: false, + xalign: 0.5, + }); + spinButton.set_adjustment(adjustment); + spinButton._is_spinbutton = true; + return spinButton; + } + + newComboBox() { + const model = new Gtk.ListStore(); + model.set_column_types([GObject.TYPE_STRING, GObject.TYPE_INT]); + const comboBox = new Gtk.ComboBox({ + model, + halign: Gtk.Align.END, + valign: Gtk.Align.CENTER, + hexpand: true, + }); + const renderer = new Gtk.CellRendererText(); + comboBox.pack_start(renderer, true); + comboBox.add_attribute(renderer, 'text', 0); + comboBox._is_combo_box = true; + return comboBox; + } + + newDropDown() { + const dropDown = new Gtk.DropDown({ + model: new Gio.ListStore({ + item_type: DropDownItem + }), + halign: Gtk.Align.END, + valign: Gtk.Align.CENTER, + hexpand: true, + }); + dropDown._is_drop_down = true; + return dropDown; + } + + newScale(adjustment) { + const scale = new Gtk.Scale({ + orientation: Gtk.Orientation.HORIZONTAL, + draw_value: true, + has_origin: false, + value_pos: Gtk.PositionType.LEFT, + digits: 0, + halign: Gtk.Align.END, + valign: Gtk.Align.CENTER, + hexpand: true, + vexpand: false, + }); + scale.set_size_request(300, -1); + scale.set_adjustment(adjustment); + scale._is_scale = true; + return scale; + } + + newLabel(text = '') { + const label = new Gtk.Label({ + label: text, + halign: Gtk.Align.END, + valign: Gtk.Align.CENTER, + hexpand: true, + }); + label._activatable = false; + return label; + } + + newLinkButton(uri) { + const linkBtn = new Gtk.LinkButton({ + label: shellVersion < 42 ? 'Click Me!' : '', + uri, + halign: Gtk.Align.END, + valign: Gtk.Align.CENTER, + hexpand: true, + }); + return linkBtn; + } + + newResetButton(callback) { + const btn = new Gtk.Button({ + halign: Gtk.Align.END, + valign: Gtk.Align.CENTER, + hexpand: true, + css_classes: ['destructive-action'], + icon_name: 'view-refresh-symbolic' + }); + + btn.connect('clicked', callback); + btn._activatable = false; + return btn; + } + + newOptionsResetButton() { + const btn = new Gtk.Button({ + halign: Gtk.Align.END, + valign: Gtk.Align.CENTER, + hexpand: true, + css_classes: ['destructive-action'], + icon_name: 'view-refresh-symbolic' + }); + + btn.connect('clicked', () => { + const settings = this._settings; + settings.list_keys().forEach( + key => settings.reset(key) + ); + }); + btn._activatable = false; + return btn; + } +} + +var AdwPrefs = class { + constructor(gOptions) { + this._gOptions = gOptions; + } + + getFilledWindow(window, pages) { + for (let page of pages) { + const title = page.title; + const icon_name = page.iconName; + const optionList = page.optionList; + + window.add( + this._getAdwPage(optionList, { + title, + icon_name + }) + ); + } + + window.set_search_enabled(true); + + return window; + } + + _getAdwPage(optionList, pageProperties = {}) { + pageProperties.width_request = 840; + const page = new Adw.PreferencesPage(pageProperties); + let group; + for (let item of optionList) { + // label can be plain text for Section Title + // or GtkBox for Option + const option = item[0]; + const widget = item[1]; + if (!widget) { + if (group) { + page.add(group); + } + group = new Adw.PreferencesGroup({ + title: option, + hexpand: true, + width_request: 700 + }); + continue; + } + + const row = new Adw.ActionRow({ + title: option._title, + }); + + const grid = new Gtk.Grid({ + column_homogeneous: false, + column_spacing: 20, + margin_start: 8, + margin_end: 8, + margin_top: 8, + margin_bottom: 8, + hexpand: true, + }) + /*for (let i of item) { + box.append(i);*/ + grid.attach(option, 0, 0, 1, 1); + if (widget) { + grid.attach(widget, 1, 0, 1, 1); + } + row.set_child(grid); + if (widget._activatable === false) { + row.activatable = false; + } else { + row.activatable_widget = widget; + } + group.add(row); + } + page.add(group); + return page; + } +} + +var LegacyPrefs = class { + constructor(gOptions) { + this._gOptions = gOptions; + } + + getPrefsWidget(pages) { + const prefsWidget = new Gtk.Box({ + orientation: Gtk.Orientation.VERTICAL + }); + const stack = new Gtk.Stack({ + hexpand: true + }); + const stackSwitcher = new Gtk.StackSwitcher({ + halign: Gtk.Align.CENTER, + hexpand: true + }); + + const context = stackSwitcher.get_style_context(); + context.add_class('caption'); + + stackSwitcher.set_stack(stack); + stack.set_transition_duration(300); + stack.set_transition_type(Gtk.StackTransitionType.SLIDE_LEFT_RIGHT); + + const pageProperties = { + hscrollbar_policy: Gtk.PolicyType.NEVER, + vscrollbar_policy: Gtk.PolicyType.AUTOMATIC, + vexpand: true, + hexpand: true, + visible: true + }; + + const pagesBtns = []; + + for (let page of pages) { + const name = page.name; + const title = page.title; + const iconName = page.iconName; + const optionList = page.optionList; + + stack.add_named(this._getLegacyPage(optionList, pageProperties), name); + pagesBtns.push( + [new Gtk.Label({ label: title}), _newImageFromIconName(iconName, Gtk.IconSize.BUTTON)] + ); + } + + let stBtn = stackSwitcher.get_first_child ? stackSwitcher.get_first_child() : null; + for (let i = 0; i < pagesBtns.length; i++) { + const box = new Gtk.Box({orientation: Gtk.Orientation.VERTICAL, spacing: 6, visible: true}); + const icon = pagesBtns[i][1]; + icon.margin_start = 30; + icon.margin_end = 30; + box.append(icon); + box.append(pagesBtns[i][0]); + if (stackSwitcher.get_children) { + stBtn = stackSwitcher.get_children()[i]; + stBtn.add(box); + } else { + stBtn.set_child(box); + stBtn.visible = true; + stBtn = stBtn.get_next_sibling(); + } + } + + stack.show_all && stack.show_all(); + stackSwitcher.show_all && stackSwitcher.show_all(); + + prefsWidget.append(stack); + + prefsWidget.show_all && prefsWidget.show_all(); + + prefsWidget._stackSwitcher = stackSwitcher; + + return prefsWidget; + } + + _getLegacyPage(optionList, pageProperties) { + const page = new Gtk.ScrolledWindow(pageProperties); + const mainBox = new Gtk.Box({ + orientation: Gtk.Orientation.VERTICAL, + spacing: 5, + homogeneous: false, + margin_start: 30, + margin_end: 30, + margin_top: 12, + margin_bottom: 12, + }); + + const context = page.get_style_context(); + context.add_class('background'); + + let frame; + let frameBox; + for (let item of optionList) { + // label can be plain text for Section Title + // or GtkBox for Option + const option = item[0]; + const widget = item[1]; + + if (!widget) { + const lbl = new Gtk.Label({ + label: option, + xalign: 0, + margin_bottom: 4 + }); + + const context = lbl.get_style_context(); + context.add_class('heading'); + + mainBox.append(lbl); + + frame = new Gtk.Frame({ + margin_bottom: 16 + }); + + frameBox = new Gtk.ListBox({ + selection_mode: null + }); + + mainBox.append(frame); + frame.set_child(frameBox); + continue; + } + + const grid = new Gtk.Grid({ + column_homogeneous: false, + column_spacing: 20, + margin_start: 8, + margin_end: 8, + margin_top: 8, + margin_bottom: 8, + hexpand: true + }) + + grid.attach(option, 0, 0, 5, 1); + + if (widget) { + grid.attach(widget, 5, 0, 2, 1); + } + frameBox.append(grid); + } + page.set_child(mainBox); + + return page; + } +} + +const DropDownItem = GObject.registerClass({ + GTypeName: 'DropdownItem', + Properties: { + 'text': GObject.ParamSpec.string( + 'text', + 'Text', + 'DropDown item text', + GObject.ParamFlags.READWRITE, + '' + ), + 'id': GObject.ParamSpec.int( + 'id', + 'Id', + 'Item id stored in settings', + GObject.ParamFlags.READWRITE, + 0, 100, 0 + ), + }, +}, class DropDownItem extends GObject.Object { + get text() { + return this._text; + } + set text(text) { + this._text = text; + } + + get id() { + return this._id; + } + set id(id) { + this._id = id; + } +} +); diff --git a/extensions/vertical-workspaces/overview.js b/extensions/vertical-workspaces/overview.js new file mode 100644 index 0000000..db267b6 --- /dev/null +++ b/extensions/vertical-workspaces/overview.js @@ -0,0 +1,68 @@ +/** + * Vertical Workspaces + * overview.js + * + * panel barrier should follow panel position + * or disable it to not collide with Custom Hot Corners barriers + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { Meta, Clutter } = imports.gi; + +const Main = imports.ui.main; +const Overview = imports.ui.overview; + +const Me = imports.misc.extensionUtils.getCurrentExtension(); +const _Util = Me.imports.util; + +let _overrides; +let opt; + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + if (reset) { + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + + _overrides = new _Util.Overrides(); + + _overrides.addOverride('Overview', Overview.Overview.prototype, OverviewCommon); +} + + +const OverviewCommon = { + _showDone: function() { + this._animationInProgress = false; + this._coverPane.hide(); + + this.emit('shown'); + // Handle any calls to hide* while we were showing + if (!this._shown) + this._animateNotVisible(); + + this._syncGrab(); + + // if user activates overview during startup animation, transition needs to be shifted to the state 2 here + const controls = this._overview._controls; + if (controls._searchController._searchActive && controls._stateAdjustment.value === 1) { + if (opt.SEARCH_VIEW_ANIMATION) { + controls._onSearchChanged(); + } else { + controls._stateAdjustment.value = 2; + } + } + } +} diff --git a/extensions/vertical-workspaces/overviewControls.js b/extensions/vertical-workspaces/overviewControls.js new file mode 100644 index 0000000..ffe0f89 --- /dev/null +++ b/extensions/vertical-workspaces/overviewControls.js @@ -0,0 +1,1464 @@ +/** + * Vertical Workspaces + * overviewControls.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { Clutter, GLib, GObject, Graphene, Meta, Shell, St } = imports.gi; +const Main = imports.ui.main; +const Util = imports.misc.util; +const OverviewControls = imports.ui.overviewControls; +const WorkspaceThumbnail = imports.ui.workspaceThumbnail; + +const ControlsState = imports.ui.overviewControls.ControlsState; +const FitMode = imports.ui.workspacesView.FitMode; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); + +const _Util = Me.imports.util; +let _overrides; + +const ANIMATION_TIME = imports.ui.overview.ANIMATION_TIME; +const DASH_MAX_SIZE_RATIO = 0.15; + +let _originalSearchControllerSigId; +let _searchControllerSigId; +let _startupAnimTimeoutId1; +let _startupAnimTimeoutId2; +let _updateAppGridTimeoutId; +let _startupInitComplete = false; + +let opt; + + +function update(reset = false) { + + if (_overrides) { + _overrides.removeAll(); + } + + _replaceOnSearchChanged(reset); + + if (reset) { + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + + _overrides = new _Util.Overrides(); + + _overrides.addOverride('ControlsManager', OverviewControls.ControlsManager.prototype, ControlsManager); + + if (opt.ORIENTATION === Clutter.Orientation.VERTICAL) { + _overrides.addOverride('ControlsManagerLayout', OverviewControls.ControlsManagerLayout.prototype, ControlsManagerLayoutVertical); + } else { + _overrides.addOverride('ControlsManagerLayout', OverviewControls.ControlsManagerLayout.prototype, ControlsManagerLayoutHorizontal); + } +} + +function _dashNotDefault() { + return Main.overview.dash !== Main.overview._overview._controls.layoutManager._dash; +} + +function _dashIsDashToDock() { + return Main.overview.dash._isHorizontal !== undefined; +} + +function _replaceOnSearchChanged(reset = false) { + const searchController = Main.overview._overview.controls._searchController; + if (reset) { + if (_searchControllerSigId) { + searchController.disconnect(_searchControllerSigId); + _searchControllerSigId = 0; + } + if (_originalSearchControllerSigId) { + searchController.unblock_signal_handler(_originalSearchControllerSigId); + _originalSearchControllerSigId = 0; + } + } else { + // reconnect signal to use custom function (callbacks cannot be overridden in class prototype, they are already in memory as a copy for the given callback) + _originalSearchControllerSigId = GObject.signal_handler_find(searchController, { signalId: 'notify', detail: 'search-active' }); + if (_originalSearchControllerSigId) { + searchController.block_signal_handler(_originalSearchControllerSigId); + } + _searchControllerSigId = searchController.connect('notify::search-active', ControlsManager._onSearchChanged.bind(Main.overview._overview.controls)); + } + +} + +var ControlsManager = { + // this function is used as a callback by a signal handler, needs to be reconnected after modification as the original callback uses a copy of the original function + /*_update: function() { + ... + }*/ + + // this function has duplicate in WorkspaceView so we use one function for both to avoid issues with syncing them + _getFitModeForState: function(state) { + return _getFitModeForState(state); + }, + + _updateThumbnailsBox: function() { + const { shouldShow } = this._thumbnailsBox; + const thumbnailsBoxVisible = shouldShow; + this._thumbnailsBox.visible = thumbnailsBoxVisible; + + // this call should be directly in _update(), but it's used as a callback function and it would require to reconnect the signal + this._updateWorkspacesDisplay(); + }, + + // this function is pure addition to the original code and handles wsDisp transition to APP_GRID view + _updateWorkspacesDisplay: function() { + this._workspacesDisplay.translation_x = 0; + this._workspacesDisplay.translation_y = 0; + this._workspacesDisplay.scale_x = 1; + this._workspacesDisplay.scale_y = 1; + const { initialState, finalState, progress, currentState } = this._stateAdjustment.getStateTransitionParams(); + const { searchActive } = this._searchController; + + const paramsForState = s => { + let opacity; + switch (s) { + case ControlsState.HIDDEN: + case ControlsState.WINDOW_PICKER: + opacity = 255; + break; + case ControlsState.APP_GRID: + opacity = 0; + break; + default: + opacity = 255; + break; + } + return { opacity }; + }; + + let initialParams = paramsForState(initialState); + let finalParams = paramsForState(finalState); + + let opacity = Math.round(Util.lerp(initialParams.opacity, finalParams.opacity, progress)); + + let workspacesDisplayVisible = (opacity != 0)/* && !(searchActive)*/; + + // improve transition from search results to desktop + if (finalState === 0 && this._searchController._searchResults.visible) { + this._searchController.hide(); + } + + // reset Static Workspace window picker mode + if (currentState === 0/*finalState === 0 && progress === 1*/ && opt.OVERVIEW_MODE && opt.WORKSPACE_MODE) { + opt.WORKSPACE_MODE = 0; + } + + if (!opt.WS_ANIMATION || !opt.SHOW_WS_TMB) { + this._workspacesDisplay.opacity = opacity; + } else if (!opt.SHOW_WS_TMB_BG) { + // fade out ws wallpaper during transition to ws switcher if ws switcher background disabled + const ws = this._workspacesDisplay._workspacesViews[global.display.get_primary_monitor()]._workspaces[this._workspaceAdjustment.value]; + if (ws) + ws._background.opacity = opacity; + } + + // if ws preview background is disabled, animate tmb box and dash + const tmbBox = this._thumbnailsBox; + const dash = this.dash; + const searchEntryBin = this._searchEntryBin; + // this dash transition collides with startup animation and freezes GS for good, needs to be delayed (first Main.overview 'hiding' event enables it) + const skipDash = _dashNotDefault(); + + // OVERVIEW_MODE 2 should animate dash and wsTmbBox only if WORKSPACE_MODE === 0 (windows not spread) + const animateOverviewMode2 = opt.OVERVIEW_MODE2 && !(finalState === 1 && opt.WORKSPACE_MODE); + if (!Main.layoutManager._startingUp && ((!opt.SHOW_WS_PREVIEW_BG && !(opt.OVERVIEW_MODE2)) || animateOverviewMode2)) { + if (!tmbBox._translationOriginal || Math.abs(tmbBox._translationOriginal[0]) > 500) { // swipe gesture can call this calculation before tmbBox is finalized, giving nonsense width + const [tmbTranslation_x, tmbTranslation_y, dashTranslation_x, dashTranslation_y, searchTranslation_y] = _Util.getOverviewTranslations(opt, dash, tmbBox, searchEntryBin); + tmbBox._translationOriginal = [tmbTranslation_x, tmbTranslation_y]; + dash._translationOriginal = [dashTranslation_x, dashTranslation_y]; + searchEntryBin._translationOriginal = searchTranslation_y; + } + if (finalState === 0 || initialState === 0) { + const prg = Math.abs((finalState == 0 ? 0 : 1) - progress); + tmbBox.translation_x = Math.round(prg * tmbBox._translationOriginal[0]); + tmbBox.translation_y = Math.round(prg * tmbBox._translationOriginal[1]); + if (!skipDash) { + dash.translation_x = Math.round(prg * dash._translationOriginal[0]); + dash.translation_y = Math.round(prg * dash._translationOriginal[1]); + } + searchEntryBin.translation_y = Math.round(prg * searchEntryBin._translationOriginal); + } + if (progress === 1) { + tmbBox._translationOriginal = 0; + if (!skipDash) { + dash._translationOriginal = 0; + } + searchEntryBin._translationOriginal = 0; + } + } else if (!Main.layoutManager._startingUp && (tmbBox.translation_x || tmbBox.translation_y)) { + tmbBox.translation_x = 0; + tmbBox.translation_y = 0; + if (!skipDash) { + dash.translation_x = 0; + dash.translation_y = 0; + } + searchEntryBin.translation_y = 0; + } + + if (!Main.layoutManager._startingUp) { + if (initialState === ControlsState.HIDDEN && finalState === ControlsState.APP_GRID) { + this._appDisplay.opacity = Math.round(progress * 255); + } else { + this._appDisplay.opacity = 255 - opacity; + } + } + + if (currentState === ControlsState.APP_GRID) { + // in app grid hide workspaces so they're not blocking app grid or ws thumbnails + this._workspacesDisplay.scale_x = 0; + } else { + this._workspacesDisplay.scale_x = 1; + } + this._workspacesDisplay.setPrimaryWorkspaceVisible(workspacesDisplayVisible); + + if (!this.dash._isAbove && progress > 0 && opt.OVERVIEW_MODE2) { + // set searchEntry above appDisplay + this.set_child_above_sibling(this._searchEntryBin, null); + // move dash above wsTmb for case that dash and wsTmb animate from the same side + this.set_child_above_sibling(dash, null); + this.set_child_below_sibling(this._thumbnailsBox, null); + this.set_child_below_sibling(this._workspacesDisplay, null); + this.set_child_below_sibling(this._appDisplay, null); + } else if (!this.dash._isAbove && progress === 1 && finalState > ControlsState.HIDDEN) { + // set dash above workspace in the overview + if (!_dashNotDefault()) { + this.set_child_above_sibling(this._thumbnailsBox, null); + this.set_child_above_sibling(this._searchEntryBin, null); + this.set_child_above_sibling(this.dash, null); + this.dash._isAbove = true; + } + + // update max tmb scale in case some other extension changed it + WorkspaceThumbnail.MAX_THUMBNAIL_SCALE = opt.MAX_THUMBNAIL_SCALE; + + } else if (this.dash._isAbove && progress < 1) { + // keep dash below for ws transition between the overview and hidden state + this.set_child_above_sibling(this._workspacesDisplay, null); + this.dash._isAbove = false; + } + }, + + // fix for upstream bug - appGrid.visible after transition from APP_GRID to HIDDEN + _updateAppDisplayVisibility: function(stateTransitionParams = null) { + if (!stateTransitionParams) + stateTransitionParams = this._stateAdjustment.getStateTransitionParams(); + + const { currentState } = stateTransitionParams; + if (this.dash.showAppsButton.checked) + this._searchTransition = false; + + // if !APP_GRID_ANIMATION, appGrid needs to be hidden in WINDOW_PICKER mode (1) + // but needs to be visible for transition from HIDDEN (0) to APP_GRID (2) + this._appDisplay.visible = + currentState > ControlsState.HIDDEN && + !this._searchController.searchActive && + !(currentState === ControlsState.WINDOW_PICKER && !opt.APP_GRID_ANIMATION) && + !this._searchTransition; + }, + + _onSearchChanged: function() { + // if user start typing or activated search provider during overview animation, this switcher will be called again after animation ends + if (opt.SEARCH_VIEW_ANIMATION && Main.overview._animationInProgress) return; + + const { finalState, currentState } = this._stateAdjustment.getStateTransitionParams(); + const { searchActive } = this._searchController; + const SIDE_CONTROLS_ANIMATION_TIME = 250; // OverviewControls.SIDE_CONTROLS_ANIMATION_TIME = Overview.ANIMATION_TIME = 250 + + if (!searchActive) { + this._workspacesDisplay.reactive = true; + this._workspacesDisplay.setPrimaryWorkspaceVisible(true); + } else { + this._searchController.show(); + } + + this._searchTransition = true; + + this._searchController._searchResults.translation_x = 0; + this._searchController._searchResults.translation_y = 0; + this._searchController.visible = true; + + if (opt.SEARCH_VIEW_ANIMATION && !this.dash.showAppsButton.checked && ![4, 8].includes(opt.WS_TMB_POSITION) /*&& !opt.OVERVIEW_MODE2*/) { + this._updateAppDisplayVisibility(); + + this._searchController.opacity = searchActive ? 255 : 0; + let translation_x = 0; + let translation_y = 0; + const geometry = global.display.get_monitor_geometry(global.display.get_primary_monitor()); + + + if (currentState < ControlsState.APP_GRID) { + switch (opt.SEARCH_VIEW_ANIMATION) { + case 0: + translation_x = 0; + translation_y = 0; + break; + case 1: + // make it longer to cover the delay before results appears + translation_x = geometry.x + geometry.width - this._searchController.x + this._workspacesDisplay.width; + translation_y = 0; + break; + case 2: + translation_x = - this._searchController.x - 2 * this._workspacesDisplay.width; + translation_y = 0; + break; + case 3: + translation_x = 0; + translation_y = geometry.y + geometry.height + this._searchController.y + this._workspacesDisplay.height; + break; + case 5: + translation_x = 0; + translation_y = - this._searchController.y - 2 * this._workspacesDisplay.height; + break; + } + } + + if (searchActive) { + this._searchController._searchResults.translation_x = translation_x; + this._searchController._searchResults.translation_y = translation_y; + } else { + this._searchController._searchResults.translation_x = 0; + this._searchController._searchResults.translation_y = 0; + } + + this._searchController._searchResults.ease({ + //opacity: searchActive ? 255 : 0, + translation_x: searchActive ? 0 : translation_x, + translation_y: searchActive ? 0 : translation_y, + duration: SIDE_CONTROLS_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onComplete: () => { + this._searchController.visible = searchActive; + this._searchTransition = false; + } + }); + + this._workspacesDisplay.opacity = 255; + } else { + this._appDisplay.ease({ + opacity: (searchActive || currentState < 2) ? 0 : 255, + duration: SIDE_CONTROLS_ANIMATION_TIME / 2, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onComplete: () => this._updateAppDisplayVisibility(), + }); + + //this._updateAppDisplayVisibility(); + this._workspacesDisplay.setPrimaryWorkspaceVisible(true); + this._workspacesDisplay.ease({ + opacity: searchActive ? 0 : 255, + duration: SIDE_CONTROLS_ANIMATION_TIME / 2, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onComplete: () => { + this._workspacesDisplay.reactive = !searchActive; + this._workspacesDisplay.setPrimaryWorkspaceVisible(!searchActive); + }, + }); + + this._searchController.ease({ + opacity: searchActive ? 255 : 0, + duration: SIDE_CONTROLS_ANIMATION_TIME / 2, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onComplete: () => (this._searchController.visible = searchActive), + }); + } + + // reuse already tuned overview transition, just replace APP_GRID with the search view + if (!Main.overview._animationInProgress && finalState !== ControlsState.HIDDEN && !this.dash.showAppsButton.checked) { + this._stateAdjustment.ease(searchActive ? ControlsState.APP_GRID : ControlsState.WINDOW_PICKER, { + // shorter animation time when entering search view can avoid stuttering in transition + // collecting search results take some time and the problematic part is the realization of the object on the screen + // if the ws animation ends before this event, the whole transition is smoother + // removing the ws transition (duration: 0) seems like the best solution here + duration: searchActive ? 0 : SIDE_CONTROLS_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onComplete: () => { + this._workspacesDisplay.setPrimaryWorkspaceVisible(!searchActive); + } + }); + } + + const entry = this._searchEntry; + if (opt.SHOW_SEARCH_ENTRY) { + entry.visible = true; + entry.opacity = 255; + } else { + entry.visible = true; + entry.opacity = searchActive ? 0 : 255; + // show search entry only if the user starts typing, and hide it when leaving the search mode + entry.ease({ + opacity: searchActive ? 255 : 0, + duration: SIDE_CONTROLS_ANIMATION_TIME / 2, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onComplete: () => { + entry.visible = searchActive; + }, + }); + } + }, + + runStartupAnimation: async function(callback) { + // fix for upstream bug - overview always shows workspace 1 instead of the active one after restart + this._workspaceAdjustment.set_value(global.workspace_manager.get_active_workspace_index()); + this._ignoreShowAppsButtonToggle = true; + + this._searchController.prepareToEnterOverview(); + this._workspacesDisplay.prepareToEnterOverview(); + + this._stateAdjustment.value = ControlsState.HIDDEN; + this._stateAdjustment.ease(ControlsState.WINDOW_PICKER, { + duration: ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + + this.dash.showAppsButton.checked = false; + this._ignoreShowAppsButtonToggle = false; + + // Set the opacity here to avoid a 1-frame flicker + this.opacity = 0; + + // We can't run the animation before the first allocation happens + await this.layout_manager.ensureAllocation(); + + const { STARTUP_ANIMATION_TIME } = imports.ui.layout; + + // Opacity + this.ease({ + opacity: 255, + duration: STARTUP_ANIMATION_TIME, + mode: Clutter.AnimationMode.LINEAR, + onComplete: () => { + // part of the workaround for stuttering first app grid animation + this._appDisplay.visible = true; + } + }); + + const dash = this.dash; + const tmbBox = this._thumbnailsBox; + + // Set the opacity here to avoid a 1-frame flicker + dash.opacity = 0; + for (const view of this._workspacesDisplay._workspacesViews) { + if (view._monitorIndex !== global.display.get_primary_monitor()) + view._thumbnails.opacity = 0; + } + + const searchEntryBin = this._searchEntryBin; + const [tmbTranslation_x, tmbTranslation_y, dashTranslation_x, dashTranslation_y, searchTranslation_y] = + _Util.getOverviewTranslations(opt, dash, tmbBox, searchEntryBin); + + const onComplete = function() { + // running init callback again causes issues (multiple connections) + if (!_startupInitComplete) + callback(); + _startupInitComplete = true; + + // force app grid to build before the first visible animation to remove possible stuttering + this._appDisplay.opacity = 1; + + const [x, y] = this._appDisplay.get_position(); + const translation_x = - x; + const translation_y = - y; + this._appDisplay.translation_x = translation_x; + this._appDisplay.translation_y = translation_y; + + // let the main loop realize previous changes before continuing + _startupAnimTimeoutId1 = GLib.timeout_add( + GLib.PRIORITY_DEFAULT, + 10, + () => { + this._appDisplay.translation_x = 0; + this._appDisplay.translation_y = 0; + this._appDisplay.visible = false; + if (opt.STARTUP_STATE === 1) { + Main.overview.hide(); + } else if (opt.STARTUP_STATE === 2) { + this._appDisplay.opacity = 255; + this.dash.showAppsButton.checked = true; + } + _startupAnimTimeoutId1 = 0; + return GLib.SOURCE_REMOVE; + } + ); + }.bind(this); + + if (dash.visible && !_dashNotDefault()) { + dash.translation_x = dashTranslation_x; + dash.translation_y = dashTranslation_y; + dash.opacity = 255; + dash.ease({ + translation_x: 0, + translation_y: 0, + delay: STARTUP_ANIMATION_TIME / 2, + duration: STARTUP_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onComplete: () => { + onComplete(); + }, + }); + } else { + // set dash opacity to make it visible if user enable it later + dash.opacity = 255; + // if dash is hidden, substitute the ease timeout with GLib.timeout + _startupAnimTimeoutId2 = GLib.timeout_add( + GLib.PRIORITY_DEFAULT, + // delay + animation time + STARTUP_ANIMATION_TIME * 2 * opt.ANIMATION_TIME_FACTOR, + () => { + onComplete(); + _startupAnimTimeoutId2 = 0; + return GLib.SOURCE_REMOVE; + } + ); + } + + if (searchEntryBin.visible) { + searchEntryBin.translation_y = searchTranslation_y; + searchEntryBin.ease({ + translation_y: 0, + delay: STARTUP_ANIMATION_TIME / 2, + duration: STARTUP_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } + + if (tmbBox.visible) { + tmbBox.translation_x = tmbTranslation_x; + tmbBox.translation_y = tmbTranslation_y; + tmbBox.ease({ + translation_x: 0, + translation_y: 0, + delay: STARTUP_ANIMATION_TIME / 2, + duration: STARTUP_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } + + // upstream bug - following animation will be cancelled, don't know where + // needs further investigation + const workspacesViews = this._workspacesDisplay._workspacesViews; + if (workspacesViews.length > 1) { + for (const view of workspacesViews) { + if (view._monitorIndex !== global.display.get_primary_monitor() && view._thumbnails.visible) { + const tmbBox = view._thumbnails; + + _Util.getOverviewTranslations(opt, dash, tmbBox, searchEntryBin); + if (opt.SEC_WS_TMB_LEFT) { + tmbBox.translation_x = - (tmbBox.width + 12); // compensate for padding + } else if (opt.SEC_WS_TMB_RIGHT) { + tmbBox.translation_x = (tmbBox.width + 12); + } else if (opt.SEC_WS_TMB_TOP) { + tmbBox.translation_y = - (tmbBox.height + 12); + } else if (opt.SEC_WS_TMB_BOTTOM) { + tmbBox.translation_y = (tmbBox.height + 12); + } + tmbBox.opacity = 255; + + tmbBox.ease({ + translation_y: 0, + delay: STARTUP_ANIMATION_TIME / 2, + duration: STARTUP_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } + } + } + }, + + animateToOverview: function(state, callback) { + // don't enter overview during updating appDisplay properties + if (_updateAppGridTimeoutId) + Main.overview.hide(); + this._ignoreShowAppsButtonToggle = true; + this._searchTransition = false; + + this._searchController.prepareToEnterOverview(); + this._workspacesDisplay.prepareToEnterOverview(); + + this._stateAdjustment.value = ControlsState.HIDDEN; + + // building window thumbnails takes some time and with many windows on the workspace + // the time can be close to or longer than ANIMATION_TIME + // in which case the the animation is greatly delayed, stuttering, or even skipped + // for user it is more acceptable to watch delayed smooth animation, + // even if it takes little more time, than jumping frames + const delay = global.display.get_tab_list(0, global.workspace_manager.get_active_workspace()).length * 3; + this._stateAdjustment.ease(state, { + delay, + duration: 250, //Overview.ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onStopped: () => { + if (callback) + callback(); + }, + }); + + this.dash.showAppsButton.checked = + state === ControlsState.APP_GRID; + + this._ignoreShowAppsButtonToggle = false; + }, +} + +var ControlsManagerLayoutVertical = { + _computeWorkspacesBoxForState: function(state, box, workAreaBox, dashWidth, dashHeight, thumbnailsWidth, searchHeight, startY) { + const workspaceBox = box.copy(); + let [width, height] = workspaceBox.get_size(); + const { x1: startX,/* y1: startY*/ } = workAreaBox; + const { spacing } = this; + //const { expandFraction } = this._workspacesThumbnails; + + const dash = Main.overview.dash; + // including Dash to Dock and clones properties for compatibility + + if (_dashIsDashToDock()) { + // Dash to Dock also always affects workAreaBox + Main.layoutManager._trackedActors.forEach((actor) => { + if (actor.affectsStruts && actor.actor.width === dash.width) { + if (dash._isHorizontal) { + // disabled inteli-hide don't needs compensation + // startY needs to be corrected in allocate() + if (dash.get_parent()?.get_parent()?.get_parent()?._intellihideIsEnabled) { + height += dash.height; + } + } else { + width += dash.width; + } + } + }); + } + + let wWidth; + let wHeight; + let wsBoxY; + + switch (state) { + case ControlsState.HIDDEN: + // if PANEL_MODE == 2 (overview only) the affectStruts property stays on false to avoid stuttering + // therefore we added panel height to startY for the overview allocation, + // but here we need to remove the correction since the panel will be in the hidden state + if (opt.START_Y_OFFSET) { + let [x, y] = workAreaBox.get_origin(); + y -= opt.START_Y_OFFSET; + workspaceBox.set_origin(x, y); + } else { + workspaceBox.set_origin(...workAreaBox.get_origin()); + } + workspaceBox.set_size(...workAreaBox.get_size()); + break; + case ControlsState.WINDOW_PICKER: + case ControlsState.APP_GRID: + if (opt.WS_ANIMATION && opt.SHOW_WS_TMB && state === ControlsState.APP_GRID) { + workspaceBox.set_origin(...this._workspacesThumbnails.get_position()); + workspaceBox.set_size(...this._workspacesThumbnails.get_size()); + } else if (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE) { + if (opt.START_Y_OFFSET) { + let [x, y] = workAreaBox.get_origin(); + y -= opt.START_Y_OFFSET; + workspaceBox.set_origin(x, y); + } else { + workspaceBox.set_origin(...workAreaBox.get_origin()); + } + workspaceBox.set_size(...workAreaBox.get_size()); + } else { + // in PANEL_MODE 2 panel don't affects workArea height (affectStruts === false), it needs to be compensated + height = opt.PANEL_POSITION_TOP ? height : height - Main.panel.height; + searchHeight = opt.SHOW_SEARCH_ENTRY ? searchHeight : 0; + wWidth = width + - (opt.DASH_VERTICAL ? dash.width : 0) + - (thumbnailsWidth) + - 4 * spacing + wHeight = height + - (opt.DASH_VERTICAL ? 0 : dashHeight) + - searchHeight + - 4 * spacing; + + const ratio = width / height; + let wRatio = wWidth / wHeight; + let scale = ratio / wRatio; + + if (scale > 1) { + wHeight = wHeight / scale; + wWidth = wHeight * ratio; + } else { + wWidth = wWidth * scale; + wHeight = wWidth / ratio; + } + + // height decides the actual size, ratio is given by the workarea + wHeight *= opt.WS_PREVIEW_SCALE; + wWidth *= opt.WS_PREVIEW_SCALE; + + let xOffset = 0; + let yOffset = 0; + + const yOffsetT = (opt.DASH_TOP ? dashHeight : 0) + searchHeight; + const yOffsetB = (opt.DASH_BOTTOM ? dashHeight : 0); + const yAvailableSpace = (height - yOffsetT - wHeight - yOffsetB) / 2; + yOffset = yOffsetT + yAvailableSpace; + + const centeredBoxX = (width - wWidth) / 2; + + const xOffsetL = (opt.DASH_LEFT ? dashWidth : 0) + (opt.WS_TMB_LEFT ? thumbnailsWidth : 0) + 2 * spacing; + const xOffsetR = (opt.DASH_RIGHT ? dashWidth : 0) + (opt.WS_TMB_RIGHT ? thumbnailsWidth : 0) + 2 * spacing; + + this._xAlignCenter = false; + if (centeredBoxX < Math.max(xOffsetL, xOffsetR)) { + xOffset = xOffsetL + spacing + (width - xOffsetL - wWidth - xOffsetR - 2 * spacing) / 2; + } else { + xOffset = centeredBoxX; + this._xAlignCenter = true; + } + + const wsBoxX = /*startX + */xOffset; + wsBoxY = Math.round(startY + yOffset); + workspaceBox.set_origin(Math.round(wsBoxX), Math.round(wsBoxY)); + workspaceBox.set_size(Math.round(wWidth), Math.round(wHeight)); + } + } + + return workspaceBox; + }, + + _getAppDisplayBoxForState: function(state, box, workAreaBox, searchHeight, dashWidth, dashHeight, thumbnailsWidth, startY) { + const [width] = box.get_size(); + const { x1: startX } = workAreaBox; + //const { y1: startY } = workAreaBox; + let height = workAreaBox.get_height(); + // in PANEL_MODE 2 panel don't affects workArea height (affectStruts === false), it needs to be compensated + height = opt.PANEL_MODE === 2 ? height - Main.panel.height : height; + const appDisplayBox = new Clutter.ActorBox(); + const { spacing } = this; + + searchHeight = opt.SHOW_SEARCH_ENTRY ? searchHeight : 0; + + const xOffsetL = (opt.WS_TMB_LEFT ? thumbnailsWidth : 0) + (opt.DASH_LEFT ? dashWidth : 0); + const xOffsetR = (opt.WS_TMB_RIGHT ? thumbnailsWidth : 0) + (opt.DASH_RIGHT ? dashWidth : 0); + const yOffsetT = (opt.DASH_TOP ? dashHeight : 0) + (opt.SHOW_SEARCH_ENTRY ? searchHeight : 0); + const yOffsetB = (opt.DASH_BOTTOM ? dashHeight : 0); + const adWidth = opt.CENTER_APP_GRID ? (width - 2 * Math.max (xOffsetL, xOffsetR) - 4 * spacing) : (width - xOffsetL - xOffsetR - 4 * spacing); + const adHeight = height - yOffsetT - yOffsetB - 4 * spacing; + + const appDisplayX = opt.CENTER_APP_GRID ? ((width - adWidth) / 2) : (xOffsetL + 2 * spacing); + const appDisplayY = startY + yOffsetT + 2 * spacing; + + switch (state) { + case ControlsState.HIDDEN: + case ControlsState.WINDOW_PICKER: + // 1 - left, 2 - right, 3 - bottom, 5 - top + switch (opt.APP_GRID_ANIMATION) { + case 0: + appDisplayBox.set_origin(appDisplayX, appDisplayY); + break; + case 1: + appDisplayBox.set_origin(startX + width, appDisplayY); + break; + case 2: + appDisplayBox.set_origin(startX - adWidth, appDisplayY); + break; + case 3: + appDisplayBox.set_origin(appDisplayX, workAreaBox.y2); + break; + case 5: + appDisplayBox.set_origin(appDisplayX, workAreaBox.y1 - adHeight); + break; + } + break; + case ControlsState.APP_GRID: + appDisplayBox.set_origin(appDisplayX, appDisplayY); + break; + } + + appDisplayBox.set_size(adWidth, adHeight); + return appDisplayBox; + }, + + vfunc_allocate: function(container, box) { + const childBox = new Clutter.ActorBox(); + + const { spacing } = this; + + const monitor = Main.layoutManager.findMonitorForActor(this._container); + const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor.index); + const startX = workArea.x - monitor.x; + // if PANEL_MODE == 2 (overview only) the affectStruts property stays on false to avoid stuttering + // therefore we need to add panel height to startY + let startY = workArea.y - monitor.y + opt.START_Y_OFFSET; + + const workAreaBox = new Clutter.ActorBox(); + workAreaBox.set_origin(startX, startY); + workAreaBox.set_size(workArea.width, workArea.height); + box.y1 += startY; + box.x1 += startX; + let [width, height] = box.get_size(); + // if panel is at bottom position, + // compensate the height of the available box (the box size is calculated for top panel) + height = opt.PANEL_POSITION_TOP ? height : height - Main.panel.height; + let availableHeight = height; + + // Dash + const maxDashHeight = Math.round(box.get_height() * DASH_MAX_SIZE_RATIO); + const maxDashWidth = maxDashHeight * 0.8; + let dashHeight = 0; + let dashWidth = 0; + + // dash cloud be overridden by the Dash to Dock clone + const dash = Main.overview.dash; + if (_dashIsDashToDock()) { + // if Dash to Dock replaced the default dash and its inteli-hide id disabled we need to compensate for affected startY + if (!Main.overview.dash.get_parent()?.get_parent()?.get_parent()?._intellihideIsEnabled) { + if (Main.panel.y === monitor.y) + startY = Main.panel.height + spacing; + } + dashHeight = dash.height; + dashWidth = dash.width; + opt.DASH_VERTICAL = [1, 3].includes(dash._position); + this._dash.allocate(childBox); + } else if (this._dash.visible) { + // default dock + if (opt.DASH_VERTICAL) { + this._dash.setMaxSize(maxDashWidth, height); + [, dashWidth] = this._dash.get_preferred_width(height); + [, dashHeight] = this._dash.get_preferred_height(dashWidth); + dashWidth = Math.min(dashWidth, maxDashWidth); + dashHeight = Math.min(dashHeight, height); + + } else if (!opt.WS_TMB_FULL) { + this._dash.setMaxSize(width, maxDashHeight); + [, dashHeight] = this._dash.get_preferred_height(width); + [, dashWidth] = this._dash.get_preferred_width(dashHeight); + dashHeight = Math.min(dashHeight, maxDashHeight); + dashWidth = Math.min(dashWidth, width); + } + } + + // Workspace Thumbnails + let wsTmbWidth = 0; + let wsTmbHeight = 0; + + if (this._workspacesThumbnails.visible) { + //const REDUCE_WS_TMB_IF_NEEDED = (this._searchController._searchActive && opt.CENTER_SEARCH_VIEW) || opt.CENTER_APP_GRID; + + const { expandFraction } = this._workspacesThumbnails; + const dashHeightReservation = (!opt.WS_TMB_FULL && !opt.DASH_VERTICAL) ? dashHeight : 0; + wsTmbHeight = opt.WS_TMB_FULL + ? height - spacing + : height - (opt.DASH_VERTICAL ? 0 : dashHeightReservation) - spacing; + + wsTmbWidth = this._workspacesThumbnails.get_preferred_custom_width(wsTmbHeight)[0]; + wsTmbWidth = Math.round(Math.min( + wsTmbWidth * expandFraction, + width * opt.MAX_THUMBNAIL_SCALE + )); + + /*if (opt.REDUCE_WS_TMB_IF_NEEDED) { + const searchAllocation = this._searchController._searchResults._content.allocation; + const searchWidth = searchAllocation.x2 - searchAllocation.x1; + wsTmbWidth = Math.clamp((width - searchWidth) / 2 - spacing, width * 0.05, wsTmbWidth); + }*/ + + wsTmbHeight = Math.round(Math.min(this._workspacesThumbnails.get_preferred_custom_height(wsTmbWidth)[1], wsTmbHeight)); + + let wsTmbX; + if (opt.WS_TMB_RIGHT) { + wsTmbX = Math.round(startX + width - (opt.DASH_RIGHT ? dashWidth : 0) - wsTmbWidth - spacing / 2); + } else { + wsTmbX = Math.round((opt.DASH_LEFT ? dashWidth : 0) + spacing / 2); + } + + let wstOffset = (height - wsTmbHeight - (opt.DASH_VERTICAL ? 0 : dashHeightReservation)) / 2; + wstOffset = wstOffset - opt.WS_TMB_POSITION_ADJUSTMENT * (wstOffset - spacing / 2); + let wsTmbY = Math.round(startY + ((dashHeightReservation && opt.DASH_TOP) ? dashHeight : 0) + wstOffset); + + childBox.set_origin(wsTmbX, wsTmbY); + childBox.set_size(wsTmbWidth, wsTmbHeight); + + this._workspacesThumbnails.allocate(childBox); + } + + + if (this._dash.visible) { + const wMaxWidth = width - spacing - wsTmbWidth - 2 * spacing - (opt.DASH_VERTICAL ? dashWidth + spacing : 0); + if (opt.WS_TMB_FULL && !opt.DASH_VERTICAL) { + this._dash.setMaxSize(wMaxWidth, maxDashHeight); + [, dashHeight] = this._dash.get_preferred_height(wMaxWidth); + [, dashWidth] = this._dash.get_preferred_width(dashHeight); + dashHeight = Math.round(Math.min(dashHeight, maxDashHeight)); + dashWidth = Math.round(Math.min(dashWidth, wMaxWidth)); + } + + let dashX, dashY, offset; + if (opt.DASH_RIGHT) + dashX = width - dashWidth; + else if (opt.DASH_LEFT) { + dashX = 0; + } + else if (opt.DASH_TOP) + dashY = startY; + else + dashY = startY + height - dashHeight; + + if (!opt.DASH_VERTICAL) { + offset = (width - (((opt.WS_TMB_FULL || opt.CENTER_DASH_WS) && !this._xAlignCenter) ? wsTmbWidth : 0) - dashWidth) / 2; + offset = offset - opt.DASH_POSITION_ADJUSTMENT * (offset - spacing / 2); + dashX = offset; + + if ((opt.WS_TMB_FULL || opt.CENTER_DASH_WS) && !this._xAlignCenter) { + if (opt.WS_TMB_RIGHT) { + //dashX = Math.min(dashX, width - dashWidth - (wsTmbWidth ? wsTmbWidth : 0)); + } else { + dashX = (wsTmbWidth ? wsTmbWidth : 0) + offset; + dashX = Math.max(dashX, wsTmbWidth ? wsTmbWidth + spacing : 0); + dashX = Math.min(dashX, width - dashWidth - spacing); + } + } + if (opt.WS_TMB_FULL && !opt.CENTER_DASH_WS) { + dashX = opt.WS_TMB_RIGHT + ? Math.min(width - wsTmbWidth - dashWidth, dashX + (wsTmbWidth) / 2 * (1 - Math.abs(opt.DASH_POSITION_ADJUSTMENT))) + : Math.max(wsTmbWidth, dashX - (wsTmbWidth) / 2 * (1 - Math.abs(opt.DASH_POSITION_ADJUSTMENT))); + } + } else { + const offset = (height - dashHeight) / 2; + dashY = startY + (offset - opt.DASH_POSITION_ADJUSTMENT * offset); + } + + childBox.set_origin(Math.round(startX + dashX), Math.round(dashY)); + childBox.set_size(dashWidth, dashHeight); + this._dash.allocate(childBox); + } + + availableHeight -= (opt.DASH_VERTICAL ? 0 : dashHeight + spacing); + + let [searchHeight] = this._searchEntry.get_preferred_height(width - wsTmbWidth); + + // Workspaces + let params = [box, workAreaBox, dashWidth, dashHeight, wsTmbWidth, searchHeight, startY]; + const transitionParams = this._stateAdjustment.getStateTransitionParams(); + + // Update cached boxes + for (const state of Object.values(ControlsState)) { + this._cachedWorkspaceBoxes.set( + state, this._computeWorkspacesBoxForState(state, ...params)); + } + + let workspacesBox; + if (!transitionParams.transitioning) { + workspacesBox = this._cachedWorkspaceBoxes.get(transitionParams.currentState); + } + if (!workspacesBox) { + const initialBox = this._cachedWorkspaceBoxes.get(transitionParams.initialState); + const finalBox = this._cachedWorkspaceBoxes.get(transitionParams.finalState); + workspacesBox = initialBox.interpolate(finalBox, transitionParams.progress); + } + + this._workspacesDisplay.allocate(workspacesBox); + + // Search entry + const searchXoffset = (opt.DASH_LEFT ? dashWidth : 0) + spacing + (opt.WS_TMB_RIGHT ? 0 : wsTmbWidth + spacing); + //let [searchHeight] = this._searchEntry.get_preferred_height(width - wsTmbWidth); + + // Y position under top Dash + let searchEntryX, searchEntryY; + /*if (opt.OVERVIEW_MODE2 && !opt.DASH_TOP && !opt.WS_TMB_TOP) { + searchEntryY = 7; + } else*/ if (opt.DASH_TOP) { + searchEntryY = startY + dashHeight - spacing; + } else { + searchEntryY = startY; + } + + searchEntryX = searchXoffset; + let searchWidth = width - 2 * spacing - wsTmbWidth - (opt.DASH_VERTICAL ? dashWidth : 0); // xAlignCenter is given by wsBox + searchWidth = this._xAlignCenter ? width - 2 * (wsTmbWidth + spacing) : searchWidth; + + if (opt.CENTER_SEARCH_VIEW) { + childBox.set_origin(0, searchEntryY); + childBox.set_size(width, searchHeight); + } else { + childBox.set_origin(this._xAlignCenter ? 0 : searchEntryX, searchEntryY); + childBox.set_size(this._xAlignCenter ? width : searchWidth - spacing, searchHeight); + } + + this._searchEntry.allocate(childBox); + + availableHeight -= searchHeight + spacing; + + // AppDisplay - state, box, workAreaBox, searchHeight, dashHeight, appGridBox, wsTmbWidth + //if (this._appDisplay.visible) { + + params = [box, workAreaBox, searchHeight, dashWidth, dashHeight, wsTmbWidth, startY]; // send startY, can be compensated + let appDisplayBox; + if (!transitionParams.transitioning) { + appDisplayBox = + this._getAppDisplayBoxForState(transitionParams.currentState, ...params); + } else { + const initialBox = + this._getAppDisplayBoxForState(transitionParams.initialState, ...params); + const finalBox = + this._getAppDisplayBoxForState(transitionParams.finalState, ...params); + + appDisplayBox = initialBox.interpolate(finalBox, transitionParams.progress); + } + this._appDisplay.allocate(appDisplayBox); + //} + + // Search + if (opt.CENTER_SEARCH_VIEW) { + const dashW = (opt.DASH_VERTICAL ? dashWidth : 0) + spacing; + searchWidth = width - 2 * wsTmbWidth - 2 * dashW; + childBox.set_origin(wsTmbWidth + dashW, startY + (opt.DASH_TOP ? dashHeight : spacing) + searchHeight); + } else { + childBox.set_origin(this._xAlignCenter ? wsTmbWidth + spacing : searchXoffset, startY + (opt.DASH_TOP ? dashHeight : spacing) + searchHeight); + } + + childBox.set_size(searchWidth, availableHeight); + this._searchController.allocate(childBox); + + this._runPostAllocation(); + } +} + +var ControlsManagerLayoutHorizontal = { + _computeWorkspacesBoxForState: function(state, box, workAreaBox, dashWidth, dashHeight, thumbnailsHeight, searchHeight, startY) { + const workspaceBox = box.copy(); + let [width, height] = workspaceBox.get_size(); + let { x1: startX/*, y1: startY*/ } = workAreaBox; + const { spacing } = this; + //const { expandFraction } = this._workspacesThumbnails; + + const dash = Main.overview.dash; + // including Dash to Dock and clones properties for compatibility + if (_dashIsDashToDock()) { + // Dash to Dock always affects workAreaBox + Main.layoutManager._trackedActors.forEach((actor) => { + if (actor.affectsStruts && actor.actor.width === dash.width) { + if (dash._isHorizontal) { + // disabled inteli-hide don't need compensation + // startY needs to be corrected in allocate() + if (dash.get_parent()?.get_parent()?.get_parent()?._intellihideIsEnabled) { + height += dash.height; + } else if (opt.DASH_TOP) { + height += dash.height; + } + } else { + width += dash.width; + } + } + }); + } + + let wWidth, wHeight, wsBoxY, wsBoxX; + + switch (state) { + case ControlsState.HIDDEN: + // if PANEL_MODE == 2 (overview only) the affectStruts property stays on false to avoid stuttering + // therefore we added panel height to startY for the overview allocation, + // but here we need to remove the correction since the panel will be in the hidden state + if (opt.START_Y_OFFSET) { + let [x, y] = workAreaBox.get_origin(); + y -= opt.START_Y_OFFSET; + workspaceBox.set_origin(x, y); + } else { + workspaceBox.set_origin(...workAreaBox.get_origin()); + } + workspaceBox.set_size(...workAreaBox.get_size()); + break; + case ControlsState.WINDOW_PICKER: + case ControlsState.APP_GRID: + if (opt.WS_ANIMATION && opt.SHOW_WS_TMB && state === ControlsState.APP_GRID) { + workspaceBox.set_origin(...this._workspacesThumbnails.get_position()); + workspaceBox.set_size(...this._workspacesThumbnails.get_size()); + } else if (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE) { + if (opt.START_Y_OFFSET) { + let [x, y] = workAreaBox.get_origin(); + y -= opt.START_Y_OFFSET; + workspaceBox.set_origin(x, y); + } else { + workspaceBox.set_origin(...workAreaBox.get_origin()); + } + workspaceBox.set_size(...workAreaBox.get_size()); + } else { + // in PANEL_MODE 2 panel don't affects workArea height (affectStruts === false), it needs to be compensated + height = opt.PANEL_POSITION_TOP ? height : height - Main.panel.height; + searchHeight = opt.SHOW_SEARCH_ENTRY ? searchHeight : 0; + wWidth = width + - spacing + - (opt.DASH_VERTICAL ? dashWidth : 0) + - 4 * spacing; + wHeight = height + - (opt.DASH_VERTICAL ? spacing : (dashHeight ? dashHeight : 0)) + - (thumbnailsHeight ? thumbnailsHeight : 0) + - searchHeight + - 4 * spacing; + + const ratio = width / height; + let wRatio = wWidth / wHeight; + let scale = ratio / wRatio; + + if (scale > 1) { + wHeight = wHeight / scale; + wWidth = wHeight * ratio; + } else { + wWidth = wWidth * scale; + wHeight = wWidth / ratio; + } + + // height decides the actual size, ratio is given by the workarea + wHeight *= opt.WS_PREVIEW_SCALE; + wWidth *= opt.WS_PREVIEW_SCALE; + + let xOffset = 0; + let yOffset = 0; + + const yOffsetT = (opt.DASH_TOP ? dashHeight : 0) + (opt.WS_TMB_TOP ? thumbnailsHeight : 0) + searchHeight; + const yOffsetB = (opt.DASH_BOTTOM ? dashHeight : 0) + (opt.WS_TMB_BOTTOM ? thumbnailsHeight : 0); + + const yAvailableSpace = (height - yOffsetT - wHeight - yOffsetB) / 2; + yOffset = yOffsetT + yAvailableSpace; + + const xOffsetL = (opt.DASH_LEFT ? dashWidth : 0) + spacing; + const xOffsetR = (opt.DASH_RIGHT ? dashWidth : 0) + spacing; + const centeredBoxX = (width - wWidth) / 2; + + this._xAlignCenter = false; + if (centeredBoxX < Math.max(xOffsetL, xOffsetR)) { + xOffset = xOffsetL + spacing + (width - xOffsetL - wWidth - xOffsetR) / 2; + } else { + xOffset = centeredBoxX; + this._xAlignCenter = true; + } + + wsBoxX = /*startX + */xOffset; + wsBoxY = Math.round(startY + yOffset) + workspaceBox.set_origin(Math.round(wsBoxX), Math.round(wsBoxY)); + workspaceBox.set_size(Math.round(wWidth), Math.round(wHeight)); + } + } + + return workspaceBox; + }, + + _getAppDisplayBoxForState: function(state, box, workAreaBox, searchHeight, dashWidth, dashHeight, thumbnailsHeight, startY) { + const [width] = box.get_size(); + const { x1: startX } = workAreaBox; + //const { y1: startY } = workAreaBox; + let height = workAreaBox.get_height(); + // in PANEL_MODE 2 panel don't affects workArea height (affectStruts === false), it needs to be compensated + height = opt.PANEL_MODE === 2 ? height - Main.panel.height : height; + const appDisplayBox = new Clutter.ActorBox(); + const { spacing } = this; + + const yOffsetT = (opt.WS_TMB_TOP ? thumbnailsHeight : 0) + (opt.DASH_TOP ? dashHeight : 0) + (opt.SHOW_SEARCH_ENTRY ? searchHeight : 0); + const yOffsetB = (opt.WS_TMB_BOTTOM ? thumbnailsHeight : 0) + (opt.DASH_BOTTOM ? dashHeight : 0); + const xOffsetL = (opt.DASH_LEFT ? dashWidth : 0); + const xOffsetR = (opt.DASH_RIGHT ? dashWidth : 0); + const adWidth = opt.CENTER_APP_GRID ? (width - 2 * Math.max (xOffsetL, xOffsetR) - 4 * spacing) : (width - xOffsetL - xOffsetR - 4 * spacing); + const adHeight = height - yOffsetT - yOffsetB - 4 * spacing; + + const appDisplayX = opt.CENTER_APP_GRID ? ((width - adWidth) / 2) : (xOffsetL + 2 * spacing); + const appDisplayY = startY + yOffsetT + 2 * spacing; + + switch (state) { + case ControlsState.HIDDEN: + case ControlsState.WINDOW_PICKER: + // 1 - left, 2 - right, 3 - bottom, 5 - top + switch (opt.APP_GRID_ANIMATION) { + case 0: + appDisplayBox.set_origin(appDisplayX, appDisplayY); + break; + case 1: + appDisplayBox.set_origin(startX + width, appDisplayY); + break; + case 2: + appDisplayBox.set_origin(startX - adWidth, appDisplayY); + break; + case 3: + appDisplayBox.set_origin(appDisplayX, workAreaBox.y2); + break; + case 5: + appDisplayBox.set_origin(appDisplayX, workAreaBox.y1 - adHeight); + break; + } + break; + case ControlsState.APP_GRID: + appDisplayBox.set_origin(appDisplayX, appDisplayY); + break; + } + + appDisplayBox.set_size(adWidth, adHeight); + return appDisplayBox; + }, + + vfunc_allocate: function(container, box) { + const childBox = new Clutter.ActorBox(); + + const { spacing } = this; + + const monitor = Main.layoutManager.findMonitorForActor(this._container); + const workArea = Main.layoutManager.getWorkAreaForMonitor(monitor.index); + const startX = workArea.x - monitor.x; + // if PANEL_MODE == 2 (overview only) the affectStruts property stays on false to avoid stuttering + // therefore we need to add panel height to startY + let startY = workArea.y - monitor.y + opt.START_Y_OFFSET; + const workAreaBox = new Clutter.ActorBox(); + workAreaBox.set_origin(startX, startY); + workAreaBox.set_size(workArea.width, workArea.height); + box.y1 += startY; + box.x1 += startX; + let [width, height] = box.get_size(); + // if panel is at bottom position, + // compensate the height of the available box (the box size is calculated for top panel) + height = opt.PANEL_POSITION_TOP ? height : height - Main.panel.height; + let availableHeight = height; + + // Dash + const maxDashHeight = Math.round(box.get_height() * DASH_MAX_SIZE_RATIO); + const maxDashWidth = maxDashHeight * 0.8; + let dashHeight = 0; + let dashWidth = 0; + + // dash cloud be overridden by the Dash to Dock clone + const dash = Main.overview.dash; + if (_dashIsDashToDock()) { + // if Dash to Dock replaced the default dash and its inteli-hide is disabled we need to compensate for affected startY + if (!Main.overview.dash.get_parent()?.get_parent()?.get_parent()?._intellihideIsEnabled) { + if (Main.panel.y === monitor.y) + startY = Main.panel.height + spacing; + } + dashHeight = dash.height; + dashWidth = dash.width; + opt.DASH_TOP = dash._position === 0; + opt.DASH_VERTICAL = [1, 3].includes(dash._position); + this._dash.allocate(childBox); + } else if (this._dash.visible) { + // default dock + if (!opt.DASH_VERTICAL) { + this._dash.setMaxSize(width, maxDashHeight); + [, dashHeight] = this._dash.get_preferred_height(width); + [, dashWidth] = this._dash.get_preferred_width(dashHeight); + dashHeight = Math.min(dashHeight, maxDashHeight); + dashWidth = Math.min(dashWidth, width - spacing); + + } else if (!opt.WS_TMB_FULL) { + this._dash.setMaxSize(maxDashWidth, height); + [, dashWidth] = this._dash.get_preferred_width(height); + [, dashHeight] = this._dash.get_preferred_height(dashWidth); + dashHeight = Math.min(dashHeight, height - spacing); + dashWidth = Math.min(dashWidth, width); + } + } + + let [searchHeight] = this._searchEntry.get_preferred_height(width); + + let wsTmbWidth = 0; + let wsTmbHeight = 0; + + if (this._workspacesThumbnails.visible) { + const { expandFraction } = this._workspacesThumbnails; + const dashWidthReservation = (!opt.WS_TMB_FULL && opt.DASH_VERTICAL) ? dashWidth : 0; + + wsTmbWidth = opt.WS_TMB_FULL + ? width + : width - (opt.DASH_VERTICAL ? 0 : dashWidthReservation); + + wsTmbHeight = this._workspacesThumbnails.get_preferred_height(wsTmbWidth)[0]; + wsTmbHeight = Math.round(Math.min( + wsTmbHeight * expandFraction, + height * opt.MAX_THUMBNAIL_SCALE + )); + + wsTmbWidth = Math.round(Math.min(this._workspacesThumbnails.get_preferred_custom_width(wsTmbHeight)[1], wsTmbWidth)); + + let wsTmbY; + if (opt.WS_TMB_TOP) { + wsTmbY = Math.round(startY + /*searchHeight + */(opt.DASH_TOP ? dashHeight : spacing / 2)); + } else { + //const boxY = workArea.y - monitor.y; // startY might be compensated + //wsTmbY = Math.round(boxY + height - (DASH_BOTTOM ? dashHeight : 0) - wsTmbHeight); + wsTmbY = Math.round(startY + height - (opt.DASH_BOTTOM ? dashHeight : 0) - wsTmbHeight); + } + + let wstOffset = (width - wsTmbWidth) / 2; + wstOffset = wstOffset - opt.WS_TMB_POSITION_ADJUSTMENT * wstOffset; + let wsTmbX = Math.round(Math.clamp( + startX + wstOffset, + startX + (opt.DASH_LEFT ? dashWidthReservation + spacing / 2 : spacing / 2), + width - wsTmbWidth - startX - (opt.DASH_RIGHT ? dashWidthReservation + spacing / 2 : spacing / 2) + )); + + childBox.set_origin(wsTmbX, wsTmbY); + childBox.set_size(wsTmbWidth, wsTmbHeight); + + this._workspacesThumbnails.allocate(childBox); + + availableHeight -= wsTmbHeight + spacing; + } + + + if (this._dash.visible) { + //const wMaxHeight = height - spacing - wsTmbHeight - 2 * spacing - (DASH_VERTICAL ? 0 : dashHeight + spacing); + if (opt.WS_TMB_FULL && opt.DASH_VERTICAL) { + const wMaxHeight = height - spacing - wsTmbHeight; + this._dash.setMaxSize(maxDashWidth, wMaxHeight); + [, dashWidth] = this._dash.get_preferred_width(wMaxHeight); + [, dashHeight] = this._dash.get_preferred_height(dashWidth); + dashWidth = Math.round(Math.min(dashWidth, maxDashWidth)); + dashHeight = Math.round(Math.min(dashHeight, wMaxHeight)); + } + + let dashX, dashY, offset; + if (opt.DASH_RIGHT) { + dashX = width - dashWidth; + } else if (opt.DASH_LEFT) { + dashX = 0; + } else if (opt.DASH_TOP) { + dashY = startY; + } else { + dashY = startY + height - dashHeight; + } + + if (opt.DASH_VERTICAL) { + if (opt.WS_TMB_FULL) { + offset = (height - dashHeight - wsTmbHeight) / 2; + if (opt.WS_TMB_TOP) { + offset = offset - opt.DASH_POSITION_ADJUSTMENT * (offset - spacing / 2); + dashY = startY + offset + wsTmbHeight; + //dashY = Math.max(dashY, startY + wsTmbHeight); + } else { + offset = offset - opt.DASH_POSITION_ADJUSTMENT * (offset - spacing / 2); + dashY = startY + offset; + //dashY = Math.max(dashY, height - wsTmbHeight - dashHeight - 3 * spacing); + } + } else { + offset = (height - dashHeight) / 2; + offset = offset - opt.DASH_POSITION_ADJUSTMENT * (offset - spacing / 2); + dashY = startY + offset; + } + } else { + offset = (width - dashWidth) / 2; + dashX = startX + (offset - opt.DASH_POSITION_ADJUSTMENT * (offset - spacing)); + } + + childBox.set_origin(Math.round(startX + dashX), Math.round(dashY)); + childBox.set_size(dashWidth, dashHeight); + this._dash.allocate(childBox); + } + + availableHeight -= (opt.DASH_VERTICAL ? 0 : dashHeight); + + /*let [searchHeight] = this._searchEntry.get_preferred_height(width);*/ + + // Workspaces + let params = [box, workAreaBox, dashWidth, dashHeight, wsTmbHeight, searchHeight, startY]; + const transitionParams = this._stateAdjustment.getStateTransitionParams(); + + // Update cached boxes + for (const state of Object.values(ControlsState)) { + this._cachedWorkspaceBoxes.set( + state, this._computeWorkspacesBoxForState(state, ...params)); + } + + let workspacesBox; + if (!transitionParams.transitioning) { + workspacesBox = this._cachedWorkspaceBoxes.get(transitionParams.currentState); + } + if (!workspacesBox) { + const initialBox = this._cachedWorkspaceBoxes.get(transitionParams.initialState); + const finalBox = this._cachedWorkspaceBoxes.get(transitionParams.finalState); + workspacesBox = initialBox.interpolate(finalBox, transitionParams.progress); + } + + this._workspacesDisplay.allocate(workspacesBox); + + // Search entry + const searchXoffset = (opt.DASH_LEFT ? dashWidth : 0) + spacing; + //let [searchHeight] = this._searchEntry.get_preferred_height(width - wsTmbWidth); + + // Y position under top Dash + let searchEntryX, searchEntryY; + /*if (opt.OVERVIEW_MODE2 && !opt.DASH_TOP && !opt.WS_TMB_TOP) { + searchEntryY = 7; + } else */if (opt.DASH_TOP) { + searchEntryY = startY + (opt.WS_TMB_TOP ? wsTmbHeight : 0) + dashHeight - spacing; + } else { + searchEntryY = startY + (opt.WS_TMB_TOP ? wsTmbHeight + spacing : 0); + } + + searchEntryX = searchXoffset; + let searchWidth = width - 2 * spacing - (opt.DASH_VERTICAL ? dashWidth : 0); // xAlignCenter is given by wsBox + searchWidth = this._xAlignCenter ? width : searchWidth; + + if (opt.CENTER_SEARCH_VIEW) { + childBox.set_origin(0, searchEntryY); + childBox.set_size(width, searchHeight); + } else { + childBox.set_origin(this._xAlignCenter ? 0 : searchEntryX, searchEntryY); + childBox.set_size(this._xAlignCenter ? width : searchWidth - spacing, searchHeight); + } + + this._searchEntry.allocate(childBox); + + availableHeight -= searchHeight + spacing; + + // AppDisplay - state, box, workAreaBox, searchHeight, dashHeight, appGridBox, wsTmbWidth + //if (this._appDisplay.visible) { + params = [box, workAreaBox, searchHeight, dashWidth, dashHeight, wsTmbHeight, startY]; + let appDisplayBox; + if (!transitionParams.transitioning) { + appDisplayBox = + this._getAppDisplayBoxForState(transitionParams.currentState, ...params); + } else { + const initialBox = + this._getAppDisplayBoxForState(transitionParams.initialState, ...params); + const finalBox = + this._getAppDisplayBoxForState(transitionParams.finalState, ...params); + + appDisplayBox = initialBox.interpolate(finalBox, transitionParams.progress); + } + this._appDisplay.allocate(appDisplayBox); + //} + + // Search + if (opt.CENTER_SEARCH_VIEW) { + const dashW = (opt.DASH_VERTICAL ? dashWidth : 0) + spacing; + searchWidth = width - 2 * dashW; + childBox.set_origin(dashW, startY + (opt.DASH_TOP ? dashHeight : spacing) + (opt.WS_TMB_TOP ? wsTmbHeight + spacing : 0) + searchHeight); + } else { + childBox.set_origin(this._xAlignCenter ? spacing : searchXoffset, startY + (opt.DASH_TOP ? dashHeight : spacing) + (opt.WS_TMB_TOP ? wsTmbHeight + spacing : 0) + searchHeight); + } + + childBox.set_size(searchWidth, availableHeight); + this._searchController.allocate(childBox); + + this._runPostAllocation(); + } +} + +// same copy of this function should be available in OverviewControls and WorkspacesView +function _getFitModeForState(state) { + switch (state) { + case ControlsState.HIDDEN: + case ControlsState.WINDOW_PICKER: + return FitMode.SINGLE; + case ControlsState.APP_GRID: + if (opt.WS_ANIMATION && opt.SHOW_WS_TMB) + return FitMode.ALL; + else + return FitMode.SINGLE; + default: + return FitMode.SINGLE; + } +} diff --git a/extensions/vertical-workspaces/panel.js b/extensions/vertical-workspaces/panel.js new file mode 100644 index 0000000..2f7143d --- /dev/null +++ b/extensions/vertical-workspaces/panel.js @@ -0,0 +1,178 @@ +/** + * Vertical Workspaces + * panel.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const Main = imports.ui.main; +const Me = imports.misc.extensionUtils.getCurrentExtension(); + +const ANIMATION_TIME = imports.ui.overview.ANIMATION_TIME; + +let opt; +let _showingOverviewConId; +let _hidingOverviewConId; +let _styleChangedConId; + +function update(reset = false) { + opt = Me.imports.settings.opt; + const panelBox = Main.layoutManager.panelBox; + const panelHeight = Main.panel.height; // panelBox height can be 0 after shell start + + const geometry = global.display.get_monitor_geometry(global.display.get_primary_monitor()); + if (reset || opt.PANEL_POSITION_TOP) { + panelBox.set_position(geometry.x, geometry.y); + } else { + panelBox.set_position(geometry.x, geometry.y + geometry.height - panelHeight); + } + + if (!_styleChangedConId) { + Main.panel.connect('style-changed', ()=> Main.panel.remove_style_pseudo_class('overview')); + } + + if (reset || opt.PANEL_MODE === 0) { + //_disconnectPanel(); + _disconnectOverview() + _reparentPanel(false); + _showPanel(); + + if (_styleChangedConId) { + Main.panel.disconnect(_styleChangedConId); + _styleChangedConId = 0; + } + + panelBox.translation_y = 0; + panelBox.opacity = 255; + } else if (opt.PANEL_MODE === 1) { + if (opt.SHOW_WS_PREVIEW_BG) { + _reparentPanel(true); + if (opt.OVERVIEW_MODE2) { + // in OM2 if the panel has been moved to the overviewGroup move panel above all + Main.layoutManager.overviewGroup.set_child_above_sibling(panelBox, null); + } else { + // otherwise move the panel below overviewGroup so it can get below workspacesDisplay + Main.layoutManager.overviewGroup.set_child_below_sibling(panelBox, Main.overview._overview); + } + _showPanel(true); + } else { + // if ws preview bg is disabled, panel can stay in uiGroup + _reparentPanel(false); + _showPanel(false); + if (!_hidingOverviewConId) + _hidingOverviewConId = Main.overview.connect('hiding', () => { + if ((!opt.SHOW_WS_PREVIEW_BG || opt.OVERVIEW_MODE2)) { + _showPanel(false); + } + }); + if (!_showingOverviewConId) + _showingOverviewConId = Main.overview.connect('showing', () => { + if ((!opt.SHOW_WS_PREVIEW_BG || opt.OVERVIEW_MODE2)) { + _showPanel(true); + } + }); + } + + _connectPanel(); + } else if (opt.PANEL_MODE === 2) { + _disconnectOverview(); + _reparentPanel(false); + _showPanel(false); + _connectPanel(); + } + _setPanelStructs(reset || opt.PANEL_MODE === 0); +} + +function _disconnectOverview() { + if (_hidingOverviewConId) { + Main.overview.disconnect(_hidingOverviewConId); + _hidingOverviewConId = 0; + } + if (_showingOverviewConId) { + Main.overview.disconnect(_showingOverviewConId); + _showingOverviewConId = 0; + } +} + +function _reparentPanel(reparent = false) { + const panel = Main.layoutManager.panelBox; + if (reparent && panel.get_parent() === Main.layoutManager.uiGroup) { + Main.layoutManager.uiGroup.remove_child(panel); + Main.layoutManager.overviewGroup.add_child(panel); + } else if (!reparent && panel.get_parent() === Main.layoutManager.overviewGroup) { + Main.layoutManager.overviewGroup.remove_child(panel); + // return the panel at default position, pane shouldn't cover objects that should be above + Main.layoutManager.uiGroup.insert_child_at_index(panel, 4); + } +} + +function _setPanelStructs(state) { + Main.layoutManager._trackedActors.forEach(a => { + if (a.actor === Main.layoutManager.panelBox) + a.affectsStruts = state; + }); + + // workaround to force maximized windows to resize after removing affectsStruts + // simulation of minimal swipe gesture to the opposite direction + // todo - needs better solution!!!!!!!!!!! + /*const direction = _getAppGridAnimationDirection() === 2 ? 1 : -1; + Main.overview._swipeTracker._beginTouchSwipe(null, global.get_current_time(), 1, 1); + Main.overview._swipeTracker._updateGesture(null, global.get_current_time(), direction, 1); + GLib.timeout_add(0, 50, () => Main.overview._swipeTracker._endGesture(global.get_current_time(), 1, true));*/ +} + +function _showPanel(show = true) { + if (show) { + Main.panel.opacity = 255; + Main.layoutManager.panelBox.ease({ + duration: ANIMATION_TIME, + translation_y: 0, + onComplete: () => { + _setPanelStructs(opt.PANEL_MODE === 0); + } + }); + + } else { + const panelHeight = Main.panel.height; + Main.layoutManager.panelBox.ease({ + duration: ANIMATION_TIME, + translation_y: opt.PANEL_POSITION_TOP ? -panelHeight + 1 : panelHeight - 1, + onComplete: () => { + Main.panel.opacity = 0; + _setPanelStructs(opt.PANEL_MODE === 0); + } + }); + } +} + +function _connectPanel() { + // not reliable, disabled for now + /*if (!_panelEnterSigId) { + _panelEnterSigId = Main.panel.connect('enter-event', () => { + if (!Main.overview._shown) + _showPanel(true); + }); + } + if (!_panelLeaveSigId) { + _panelLeaveSigId = Main.panel.connect('leave-event', () => { + if (!Main.overview._shown) + _showPanel(false); + }); + }*/ +} + +function _disconnectPanel() { + /*if (_panelEnterSigId) { + Main.panel.disconnect(_panelEnterSigId); + _panelEnterSigId = 0; + } + if (_panelLeaveSigId) { + Main.panel.disconnect(_panelLeaveSigId); + _panelLeaveSigId = 0; + }*/ +} diff --git a/extensions/vertical-workspaces/prefs.js b/extensions/vertical-workspaces/prefs.js new file mode 100644 index 0000000..1870ea7 --- /dev/null +++ b/extensions/vertical-workspaces/prefs.js @@ -0,0 +1,1183 @@ +/** + * Vertical Workspaces + * prefs.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + */ + +'use strict'; + +const { Gtk, GLib } = imports.gi; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); +const Settings = Me.imports.settings; + +const ItemFactory = Me.imports.optionsFactory.ItemFactory; +const AdwPrefs = Me.imports.optionsFactory.AdwPrefs; +const LegacyPrefs = Me.imports.optionsFactory.LegacyPrefs; + +const shellVersion = Settings.shellVersion; + +// gettext +const _ = Settings._; + +// libadwaita is available starting with GNOME Shell 42. +let Adw = null; +try { Adw = imports.gi.Adw; } catch (e) {} + +let gOptions; +let pageList; +let itemFactory; + + +function init() { + ExtensionUtils.initTranslations(Me.metadata['gettext-domain']); + gOptions = new Settings.Options(); + + itemFactory = new ItemFactory(gOptions); + + pageList = [ + { + name: 'layout', + title: _('Layout'), + iconName: 'view-grid-symbolic', + optionList: _getLayoutOptionList() + }, + { + name: 'appearance', + title: _('Appearance'), + iconName: 'view-reveal-symbolic', + optionList: _getAppearanceOptionList() + }, + { + name: 'behavior', + title: _('Behavior'), + iconName: 'preferences-other-symbolic', + optionList: _getBehaviorOptionList() + }, + { + name: 'misc', + title: _('Misc'), + iconName: 'input-keyboard-symbolic', + optionList: _getMiscOptionList() + }, + { + name: 'about', + title: _('About'), + iconName: 'preferences-system-details-symbolic', + optionList: _getAboutOptionList() + } + ]; +} + +function fillPreferencesWindow(window) { + window = new AdwPrefs(gOptions).getFilledWindow(window, pageList); + window.connect('close-request', () => { + gOptions.destroy(); + gOptions = null; + itemFactory = null; + pageList = null; + }); + + window.set_default_size(800, 800); +} + +function buildPrefsWidget() { + const prefsWidget = new LegacyPrefs(gOptions).getPrefsWidget(pageList); + + prefsWidget.connect('realize', (widget) => { + const window = widget.get_root ? widget.get_root() : widget.get_toplevel(); + const width = 800; + const height = 800; + window.set_default_size(width, height); + const headerbar = window.get_titlebar(); + headerbar.title_widget = prefsWidget._stackSwitcher; + + const signal = Gtk.get_major_version() === 3 ? 'destroy' : 'close-request'; + window.connect(signal, () => { + gOptions.destroy(); + gOptions = null; + }); + }); + + return prefsWidget; +} + +////////////////////////////////////////////////////////////////////// +function _getLayoutOptionList() { + const optionList = []; + // options item format: + // [text, caption, widget, settings-variable, options for combo] + + optionList.push( + itemFactory.getRowWidget( + _('Dash'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Dash Position'), + null, + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'dashPosition', + [ [_('Top'), 0], + [_('Right'), 1], + [_('Bottom'), 2], + [_('Left'), 3], + [_('Hide'), 4], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Center Horizontal Dash to Workspace'), + _('If the Dash Position is set to Top or Bottom, the position will be recalculated relative to the workspace preview instead of the screen. Works only with the default Dash.'), + itemFactory.newSwitch(), + 'centerDashToWs', + ) + ); + + const dashPositionAdjustment = new Gtk.Adjustment({ + upper: 100, + lower: -100, + step_increment: 1, + page_increment: 10, + }); + + const dashPositionScale = itemFactory.newScale(dashPositionAdjustment); + dashPositionScale.add_mark(0, Gtk.PositionType.TOP, null); + optionList.push( + itemFactory.getRowWidget( + _('Fine Tune Dash Position'), + _('Adjusts position of the dock on chosen axis. Works only with the default Dash.'), + dashPositionScale, + 'dashPositionAdjust' + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Show Apps Icon Position'), + _('Sets the position of the "Show Applications" icon in the Dash.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'showAppsIconPosition', + [ + [_('Hide'), 2], + [_('Start'), 0], + [_('End'), 1], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Open Windows Icon Position'), + _('This option adds "Search Open Windows" icon into dash so you can directly toggle window search provider results. Even if you disable this icon, you can use the secondary mouse button click on the Show Apps Icon, or the Space hotkey to access this feature.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'dashShowWindowsIcon', + [ [_('Hide'), 0], + [_('Start'), 1], + [_('End'), 2], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Recent Files Icon Position'), + _('This option adds "Search Recent Files" icon into dash so you can directly toggle recent files search provider results. Even if you disable this icon, you can use the secondary mouse button click on the Show Apps Icon, or the Ctrl + Space hotkey to access this feature.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'dashShowRecentFilesIcon', + [ [_('Hide'), 0], + [_('Start'), 1], + [_('End'), 2], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Dash Max Icon Size'), + _('Maximum size of Dash icons in pixels. Works only with default Dash.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'dashMaxIconSize', + [ [_('128'), 128], + [_('112'), 112], + [_('96'), 96], + [_('80'), 80], + [_('64'), 64], + [_('48'), 48], + [_('32'), 32], + [_('24'), 24], + [_('16'), 16], + ] + ) + ); + + + optionList.push( + itemFactory.getRowWidget( + _('Workspaces Thumbnails / Orientation'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Thumbnails Position / Workspaces Orientation'), + _('Position of the workspaces thumbnails on the screen also sets orientation of the workspaces to vertical or horizontal. You have two options to disable workspaces thumbnails, one sets workspaces to the vertical orientation, the second one to horizontal.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'workspaceThumbnailsPosition', + // this mess is just because of backward compatibility + [ [_('Left \t Vertical Orientation'), 0], + [_('Right \t Vertical Orientation'), 1], + [_('Hide \t Set Vertical Orientation'), 4], + [_('Top \t Horizontal Orientation'), 5], + [_('Bottom \t Horizontal Orientation'), 6], + [_('Hide \t Set Horizontal Orientation'), 9], + ] + ) + ); + + const wstPositionAdjustment = new Gtk.Adjustment({ + upper: 100, + lower: -100, + step_increment: 1, + page_increment: 10, + }); + + const wstPositionScale = itemFactory.newScale(wstPositionAdjustment); + wstPositionScale.add_mark(0, Gtk.PositionType.TOP, null); + optionList.push( + itemFactory.getRowWidget( + _('Fine Tune Workspaces Thumbnails Position'), + _('Adjusts workspaces thumbnails vertical position.'), + wstPositionScale, + 'wsTmbPositionAdjust' + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Reserve Full Screen Height/Width for Thumbnails'), + _('The whole screen height/width will be reserved for workspaces thumbnails at the expense of space available for Dash (if the Dash is oriented in a different axis).'), + itemFactory.newSwitch(), + 'WsThumbnailsFull', + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Workspaces Thumbnails Position on Secondary Monitor'), + _('Allows you to place workspaces thumbnails of secondary monitors on the opposite side than on the primary monitor.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'secondaryWsThumbnailsPosition', + [ [_('Left / Top'), 0], + [_('Right / Bottom'), 1], + [_('Same as Primary'), 2], + [_('Disable'), 3], + ] + ) + ); + + const SecWstPositionAdjustment = new Gtk.Adjustment({ + upper: 100, + lower: -100, + step_increment: 1, + page_increment: 10, + }); + + const SecWstPositionScale = itemFactory.newScale(SecWstPositionAdjustment); + SecWstPositionScale.add_mark(0, Gtk.PositionType.TOP, null); + optionList.push( + itemFactory.getRowWidget( + _('Fine Tune Secondary Workspaces Thumbnails Position'), + _('Adjusts secondary monitors workspaces thumbnails vertical position.'), + SecWstPositionScale, + 'SecWsTmbPositionAdjust' + ) + ); + + const wsThumbnailScaleAdjustment = new Gtk.Adjustment({ + upper: 30, + lower: 5, + step_increment: 1, + page_increment: 1, + }); + + const wsThumbnailScale = itemFactory.newScale(wsThumbnailScaleAdjustment); + wsThumbnailScale.add_mark(13, Gtk.PositionType.TOP, null); + optionList.push( + itemFactory.getRowWidget( + _('Workspaces Thumbnails Max Scale'), + _('Adjusts maximum size of the workspaces thumbnails (% relative to display width).'), + wsThumbnailScale, + 'wsThumbnailScale' + ) + ); + + + optionList.push( + itemFactory.getRowWidget( + _('Workspace Preview'), + ) + ); + + const wsScaleAdjustment = new Gtk.Adjustment({ + upper: 100, + lower: 30, + step_increment: 1, + page_increment: 10, + }); + + const wsScaleScale = itemFactory.newScale(wsScaleAdjustment); + wsScaleScale.add_mark(100, Gtk.PositionType.TOP, null); + optionList.push( + itemFactory.getRowWidget( + _('Workspaces Scale'), + _('Scales down workspaces preview so you can fit more of the adjacent workspaces on the screen. Default size is calculated to use all available space.'), + wsScaleScale, + 'wsPreviewScale' + ) + ); + + const wsSpacingAdjustment = new Gtk.Adjustment({ + upper: 500, + lower: 10, + step_increment: 1, + page_increment: 10, + }); + + const wsSpacingScale = itemFactory.newScale(wsSpacingAdjustment); + wsSpacingScale.add_mark(350, Gtk.PositionType.TOP, null); + optionList.push( + itemFactory.getRowWidget( + _('Workspaces Spacing'), + _('Adjusts spacing between workspaces previews so you can control how much of the adjacent workspaces overlap to the current workspace overview. Default value should set the adjacent workspaces out of the screen.'), + wsSpacingScale, + 'wsMaxSpacing' + ) + ); + + + optionList.push( + itemFactory.getRowWidget( + _('App Grid'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Center App Grid'), + _('App grid in app view page will be centered to the display instead of the available space. This option may have impact on the size of the grid, more for narrower and small resolution displays, especially if workspaces thumbnails are bigger.'), + itemFactory.newSwitch(), + 'centerAppGrid', + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Icon Size'), + _('Allows to force fixed icon size and bypass the default adaptive algorithm.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'appGridIconSize', + [ [_('Adaptive (Default)'), -1], + [_('128'), 128], + [_('112'), 112], + [_('96'), 96], + [_('80'), 80], + [_('64'), 64], + [_('48'), 48], + [_('32'), 32], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Folder Icon Size'), + _('Allows to disable the default adaptive algorithm and set a fixed size of icons inside folders.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'appGridFolderIconSize', + [ [_('Adaptive (Default)'), -1], + [_('128'), 128], + [_('112'), 112], + [_('96'), 96], + [_('80'), 80], + [_('64'), 64], + [_('48'), 48], + [_('32'), 32], + ] + ) + ); + + const customGridSwitch = itemFactory.newSwitch(); + optionList.push( + itemFactory.getRowWidget( + _('Enable Custom Grid Size'), + _('Apply following grid parameters.'), + customGridSwitch, + //itemFactory.newDropDown(), + 'appGridAllowCustom' + ) + ); + + const columnsAdjustment = new Gtk.Adjustment({ + upper: 15, + lower: 2, + step_increment: 1, + page_increment: 1, + }); + + const columnsSpinBtn = itemFactory.newSpinButton(columnsAdjustment); + optionList.push(itemFactory.getRowWidget( + _('Columns per Page'), + _('Number of columns in application grid.'), + columnsSpinBtn, + 'appGridColumns' + )); + + const rowsAdjustment = new Gtk.Adjustment({ + upper: 15, + lower: 2, + step_increment: 1, + page_increment: 1, + }); + + const rowsSpinBtn = itemFactory.newSpinButton(rowsAdjustment); + optionList.push(itemFactory.getRowWidget( + _('Rows per Page'), + _('Number of rows in application grid.'), + rowsSpinBtn, + 'appGridRows' + )); + + const folderColumnsAdjustment = new Gtk.Adjustment({ + upper: 8, + lower: 2, + step_increment: 1, + page_increment: 1, + }); + + const folderColumnsSpinBtn = itemFactory.newSpinButton(folderColumnsAdjustment); + optionList.push(itemFactory.getRowWidget( + _('Folder Columns per Page'), + _('Number of columns in folder grid.'), + folderColumnsSpinBtn, + 'appGridFolderColumns' + )); + + const folderRowsAdjustment = new Gtk.Adjustment({ + upper: 8, + lower: 2, + step_increment: 1, + page_increment: 1, + }); + + const folderRowsSpinBtn = itemFactory.newSpinButton(folderRowsAdjustment); + optionList.push(itemFactory.getRowWidget( + _('Folder Rows per Page'), + _('Number of rows in folder grid.'), + folderRowsSpinBtn, + 'appGridFolderRows' + )); + + const _setOptionsSensitivity = () => { + columnsSpinBtn.sensitive = customGridSwitch.active; + rowsSpinBtn.sensitive = customGridSwitch.active; + folderColumnsSpinBtn.sensitive = customGridSwitch.active; + folderRowsSpinBtn.sensitive = customGridSwitch.active; + }; + _setOptionsSensitivity(); + customGridSwitch.connect('notify::active', () => { + _setOptionsSensitivity(); + }); + + + optionList.push( + itemFactory.getRowWidget( + _('Search View'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Center Search View'), + _('Search view will be centered to the display instead of the available space. If needed, workspaces thumbnails will be temporarily scaled down to fit the search box. This option has bigger impact for narrower and small resolution displays.'), + itemFactory.newSwitch(), + 'centerSearch', + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Always Show Search Entry'), + _('If disabled, the search entry field will be hidden when not in use, so the workspace preview and app grid may take up more space.'), + itemFactory.newSwitch(), + 'showSearchEntry', + ) + ); + + const searchViewScaleAdjustment = new Gtk.Adjustment({ + upper: 150, + lower: 50, + step_increment: 1, + page_increment: 1, + }); + + const searchViewScale = itemFactory.newScale(searchViewScaleAdjustment); + searchViewScale.add_mark(100, Gtk.PositionType.TOP, null); + optionList.push( + itemFactory.getRowWidget( + _('Search Results Width'), + _('Adjusts maximum width of search results view (% relative to default). This allows you to fit more (or less) app icons into app search result.'), + searchViewScale, + 'searchViewScale' + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('App Search Icon Size'), + _('Size of results provided by the App Search Provider.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'searchIconSize', + [[_('128'), 128], + [_('112'), 112], + [_('96'), 96], + [_('80'), 80], + [_('64'), 64], + [_('48'), 48], + [_('32'), 32],] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Panel'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Main Panel Position'), + _('Allows you to place the main panel at the bottom of your monitor.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'panelPosition', + [ [_('Top (Default)'), 0], + [_('Bottom'), 1], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Main Panel Visibility'), + _('Main panel can be visible always, only in the overview or never.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'panelVisibility', + [ [_('Always Visible (Default)'), 0], + [_('Overview Only'), 1], + [_('Always Hidden'), 2], + //[_('Desktop View Only'), 3], + ] + ) + ); + + return optionList; +} + +function _getAppearanceOptionList() { + const optionList = []; + // options item format: + // [text, caption, widget, settings-variable, options for combo] + + //---------------------------------------------------------------- + optionList.push( + itemFactory.getRowWidget( + _('Dash'), + ) + ); + + const dashBgAdjustment = new Gtk.Adjustment({ + upper: 100, + lower: 0, + step_increment: 1, + page_increment: 10, + }); + + const dashBgOpacityScale = itemFactory.newScale(dashBgAdjustment); + optionList.push( + itemFactory.getRowWidget( + _('Dash Background Opacity'), + _('Adjusts the opacity of the dash background.'), + dashBgOpacityScale, + 'dashBgOpacity' + ) + ); + + const dashRadAdjustment = new Gtk.Adjustment({ + upper: 50, + lower: 0, + step_increment: 1, + page_increment: 1, + }); + + const dashBgRadiusScale = itemFactory.newScale(dashRadAdjustment); + optionList.push( + itemFactory.getRowWidget( + _('Dash Background Radius'), + _('Adjusts the border radius of the dash background in pixels. 0 means default value.'), + dashBgRadiusScale, + 'dashBgRadius' + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Workspaces Thumbnails'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Show Workspaces Thumbnails Labels'), + _('Each workspace thumbnails can show its index and name (if defined in the system settings) or name/title of its most recently used app/window.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'showWsTmbLabels', + [ [_('Disable'), 0], + [_('Index'), 1], + [_('Index + WS Name'), 2], + [_('Index + App Name'), 3], + [_('Index + Window Title'), 4], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Show WS Thumbnail Label on Hover'), + _('Show label only when the mouse pointer hovers over a thumbnail'), + itemFactory.newSwitch(), + 'showWsTmbLabelsOnHover', + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Show Wallpaper in Workspaces Thumbnails'), + _('All workspace thumbnails will include the current desktop background.'), + itemFactory.newSwitch(), + 'showWsSwitcherBg', + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Window Preview'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Window Preview App Icon Size'), + _('Default size is 64.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'winPreviewIconSize', + [ [_('64'), 0], + [_('48'), 1], + [_('32'), 2], + [_('22'), 3], + [_('Disable'), 4] + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Always Show Window Titles'), + _('All windows on the workspace preview will show their titles, not only the one with the mouse pointer.'), + itemFactory.newSwitch(), + 'alwaysShowWinTitles', + ) + ); + + + optionList.push( + itemFactory.getRowWidget( + _('Workspace Preview'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Show Workspace Preview Background'), + _('Allows you to hide the scaling background of the workspace preview.'), + itemFactory.newSwitch(), + 'showWsPreviewBg', + ) + ); + + + optionList.push( + itemFactory.getRowWidget( + _('Overview Background'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Show Static Background'), + _('Show static background wallpaper instead of the solid grey color.'), + itemFactory.newSwitch(), + 'showBgInOverview', + ) + ); + + const blurBgAdjustment = new Gtk.Adjustment({ + upper: 100, + lower: 0, + step_increment: 1, + page_increment: 10, + }); + + const bgBlurScale = itemFactory.newScale(blurBgAdjustment); + optionList.push( + itemFactory.getRowWidget( + _('Blur Window Picker Background'), + _('Blur background wallpaper (if enabled) in the window picker view.'), + bgBlurScale, + 'overviewBgBlurSigma' + ) + ); + + const blurAppBgAdjustment = new Gtk.Adjustment({ + upper: 100, + lower: 0, + step_increment: 1, + page_increment: 10, + }); + + const bgAppBlurScale = itemFactory.newScale(blurAppBgAdjustment); + optionList.push( + itemFactory.getRowWidget( + _('Blur App Grid/Search View Background'), + _('Blur background wallpaper (if enabled) in the app grid and search results views.'), + bgAppBlurScale, + 'appGridBgBlurSigma' + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Smooth Blur Transitions'), + _('Makes blur transitions smoother but can impact overall smoothness of overview animations.'), + itemFactory.newSwitch(), + 'smoothBlurTransitions', + ) + ); + + return optionList; +} + //---------------------------------------------------------------- + +function _getBehaviorOptionList() { + const optionList = []; + + optionList.push( + itemFactory.getRowWidget( + _('Overview'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Overview Mode'), + _('The Expose Windows on Hover mode do not expose the workspace preview windows until the mouse pointer enters any window.\nThe Static Workspace mode does not scale the workspace preview, it only shows Dash and workspaces thumbnails over the desktop. Clicking on a workspace thumbnail scales the ws preview and exposes its windows like in the default overview mode.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'overviewMode', + [ [_('Default'), 0], + [_('Expose Windows on Hover'), 1], + [_('Static Workspace'), 2] + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Startup State'), + _('Allows to change the state in which GNOME Shell starts a session.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'startupState', + [ [_('Overview'), 0], + [_('Desktop'), 1], + [_('App Grid'), 2], + ] + ) + ); + + + optionList.push( + itemFactory.getRowWidget( + _('Dash'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Dash Icon Click'), + _('if the app you clicked on has more than one window and the recently used window is not on the current workspace, the overview can switch to the workspace with the recent window.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'dashShowWindowsBeforeActivation', + [ [_('Activate Last Used Window Immediately'), 0], + [_('Switch to Workspace with Recently Used Window'), 1], + ] + ) + ); + + + optionList.push( + itemFactory.getRowWidget( + _('App Grid'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Apps Order'), + _('Choose sorting method for the app grid. Note that sorting by alphabet and usage ignores folders.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'appGridOrder', + [ [_('Default'), 0], + [_('Alphabet'), 1], + [_('Usage'), 2], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Include Dash Items'), + _('Include favorite / running apps currently present in the Dash in the app grid.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'appGridIncludeDash', + [ [_('Disable'), 0], + [_('Enable'), 1], + [_('Enable - Sort First'), 2], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Allow Incomplete Pages'), + _('If disabled, icons from the next page (if any) are automatically moved to fill any empty slot left after an icon was (re)moved (to a folder for example).'), + itemFactory.newSwitch(), + //itemFactory.newDropDown(), + 'appGridIncompletePages' + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Search'), + ) + ); + + const maxSearchResultsAdjustment = new Gtk.Adjustment({ + upper: 50, + lower: 5, + step_increment: 1, + page_increment: 5, + }); + + const maxSearchResultsSpinButton = itemFactory.newScale(maxSearchResultsAdjustment); + maxSearchResultsSpinButton.add_mark(10, Gtk.PositionType.TOP, null); + maxSearchResultsSpinButton.add_mark(20, Gtk.PositionType.TOP, null); + maxSearchResultsSpinButton.add_mark(30, Gtk.PositionType.TOP, null); + maxSearchResultsSpinButton.add_mark(40, Gtk.PositionType.TOP, null); + optionList.push( + itemFactory.getRowWidget( + _('Max Search Results Rows'), + _('Sets the maximum number of rows for result lists of all search providers except window search provider which always lists all results.'), + maxSearchResultsSpinButton, + 'searchMaxResultsRows' + ) + ); + + + /*optionList.push( + itemFactory.getRowWidget( + _('Window Search Provider'), + ) + );*/ + + optionList.push( + itemFactory.getRowWidget( + _('Enable Window Search Provider'), + _('Activates the window search provider that adds open windows to the search results. You can search app names and window titles. You can also use "wq/" prefix to suppress results from other search providers.'), + itemFactory.newSwitch(), + 'searchWindowsEnable' + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Enable Recent Files Search Provider'), + _('Activates the recent files search provider that can be triggered by a dash icon, Ctrl + Space hotkey or by typing "fq//" prefix in the search entry field. This option needs File History option enabled in the GNOME Privacy settings.'), + itemFactory.newSwitch(), + 'searchRecentFilesEnable' + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Enable Fuzzy Match'), + _('Enabling the fuzzy match allows you to skip letters in the pattern you are searching for and find "Firefox" even if you type "ffx". Works only for the Window and Recent files search providers.'), + itemFactory.newSwitch(), + 'searchFuzzy' + ) + ); + + /*const wspCommandSwitch = itemFactory.newSwitch(); + optionList.push( + itemFactory.getRowWidget( + _('Enable Commands in Search Entry'), + _('You can use following commands separated by the space at the end of entered pattern:\n/x! \t\t\t- close selected window\n/xa! \t\t\t- close all found windows\n/m[number] \t\t- (e.g. /m6) move selected window to workspace with given index\n/ma[number] \t- move all found windows to workspace with given index'), + wspCommandSwitch, + 'searchWindowsCommands' + ) + );*/ + + + optionList.push( + itemFactory.getRowWidget( + _('Animations'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('App Grid Animation'), + _(`When entering the App Grid view, the app grid animates from the edge of the screen. You can choose direction, keep it Default (direction will be chosen automatically) or disable the animation if you don't like it.`), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'appGridAnimation', + [ + [_('Default'), 4], + [_('Disable'), 0], + [_('Right to Left'), 1], + [_('Left to Right'), 2], + [_('Bottom to Top'), 3], + [_('Top to Bottom'), 5], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Search View Animation'), + _(`When search is activated the search view with search results can animate from the edge of the screen. You can choose direction, keep it Default (currently Bottom to Top) or disable the animation if you don't like it.`), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'searchViewAnimation', + [ + [_('Default'), 4], + [_('Disable'), 0], + [_('Right to Left'), 1], + [_('Left to Right'), 2], + [_('Bottom to Top'), 3], + [_('Top to Bottom'), 5], + ] + ) + ); + + + optionList.push( + itemFactory.getRowWidget( + _('Workspace Preview Animation'), + _(`When entering / leaving the App Grid / Search view, the workspace preview can animate to/from workspace thumbnail.`), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'workspaceAnimation', + [ [_('Disable'), 0], + [_('Enable'), 1], + ] + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Workspace Switcher Animation'), + _('Allows you to disable movement of the desktop background during workspace switcher animation outside of the overview.'), + itemFactory.newComboBox(), + //itemFactory.newDropDown(), + 'workspaceSwitcherAnimation', + [ [_('Default'), 0], + [_('Static Background'), 1], + ] + ) + ); + + const animationSpeedAdjustment = new Gtk.Adjustment({ + upper: 500, + lower: 1, + step_increment: 10, + page_increment: 100, + }); + + const animationSpeedScale = itemFactory.newScale(animationSpeedAdjustment); + animationSpeedScale.add_mark(100, Gtk.PositionType.TOP, null); + optionList.push( + itemFactory.getRowWidget( + _('Animation Speed'), + _('Adjusts the global animation speed in % of the default duration - higher value means slower animation.'), + animationSpeedScale, + 'animationSpeedFactor' + ) + ); + + return optionList; +} + +function _getMiscOptionList() { + const optionList = []; + // options item format: + // [text, caption, widget, settings-variable, options for combo] + + optionList.push( + itemFactory.getRowWidget( + _('Keyboard'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Override Page Up/Down Shortcuts'), + _('This option automatically overrides the (Shift +) Super + Page Up/Down keyboard shortcuts for the current workspace orientation. If you encounter any issues, check the configuration in the dconf editor.'), + itemFactory.newSwitch(), + 'enablePageShortcuts', + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('App Grid'), + ) + ); + + optionList.push(itemFactory.getRowWidget( + _('Reset App Grid Layout'), + _('Removes all stored app grid icons positions, after the reset icons will be ordered alphabetically.'), + itemFactory.newResetButton(() => { + const settings = ExtensionUtils.getSettings('org.gnome.shell'); + settings.set_value('app-picker-layout', new GLib.Variant('aa{sv}', [])); + }), + )); + + optionList.push(itemFactory.getRowWidget( + _('Remove App Grid Folders'), + _('Removes all folders, folder apps move to root grid.'), + itemFactory.newResetButton(() => { + const settings = ExtensionUtils.getSettings('org.gnome.desktop.app-folders'); + settings.set_strv('folder-children', []); + }), + )); + + optionList.push( + itemFactory.getRowWidget( + _('Compatibility'), + ) + ); + + optionList.push( + itemFactory.getRowWidget( + _('Fix for Dash to Dock'), + _('With the default Ubuntu Dock and other Dash To Dock forks, you may experience issues with Activities overview after you change Dock position or change monitors configuration. If you are experiencing such issues, try to enable this option, or disable/replace the dock extension.'), + itemFactory.newSwitch(), + 'fixUbuntuDock', + ) + ); + + return optionList; +} + +function _getAboutOptionList() { + const optionList = []; + + optionList.push(itemFactory.getRowWidget( + Me.metadata.name + )); + + optionList.push(itemFactory.getRowWidget( + _('Version'), + null, + itemFactory.newLabel(Me.metadata.version.toString()), + )); + + optionList.push(itemFactory.getRowWidget( + _('Reset all options'), + _('Set all options to default values.'), + itemFactory.newOptionsResetButton(), + )); + + + optionList.push(itemFactory.getRowWidget( + _('Links') + )); + + optionList.push(itemFactory.getRowWidget( + _('Homepage'), + _('Source code and more info about this extension'), + itemFactory.newLinkButton('https://github.com/G-dH/vertical-workspaces'), + )); + + optionList.push(itemFactory.getRowWidget( + _('Changelog'), + _("See what's changed."), + itemFactory.newLinkButton('https://github.com/G-dH/vertical-workspaces/blob/main/CHANGELOG.md'), + )); + + optionList.push(itemFactory.getRowWidget( + _('GNOME Extensions'), + _('Rate and comment the extension on GNOME Extensions site.'), + itemFactory.newLinkButton('https://extensions.gnome.org/extension/5177'), + )); + + optionList.push(itemFactory.getRowWidget( + _('Report a bug or suggest new feature'), + null, + itemFactory.newLinkButton('https://github.com/G-dH/vertical-workspaces/issues'), + )); + + optionList.push(itemFactory.getRowWidget( + _('Buy Me a Coffee'), + _('If you like this extension, you can help me with my coffee expenses.'), + itemFactory.newLinkButton('https://buymeacoffee.com/georgdh'), + )); + + return optionList; +} diff --git a/extensions/vertical-workspaces/recentFilesSearchProvider.js b/extensions/vertical-workspaces/recentFilesSearchProvider.js new file mode 100644 index 0000000..b94d696 --- /dev/null +++ b/extensions/vertical-workspaces/recentFilesSearchProvider.js @@ -0,0 +1,324 @@ +/** + * Vertical Workspaces + * recentFilesSearchProvider.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + */ + +'use strict'; + +const { GLib, GObject, Gio, Gtk, Meta, St, Shell } = imports.gi; + +const Main = imports.ui.main; +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); +const Settings = Me.imports.settings; +const _ = Me.imports.settings._; + +const shellVersion = Settings.shellVersion; + +const ModifierType = imports.gi.Clutter.ModifierType; + +let recentFilesSearchProvider; +let _enableTimeoutId = 0; + +// prefix helps to eliminate results from other search providers +// so it needs to be something less common +// needs to be accessible from vw module +var prefix = 'fq//'; + +var opt; + +const Action = { + NONE: 0, + CLOSE: 1, + CLOSE_ALL: 2, + MOVE_TO_WS: 3, + MOVE_ALL_TO_WS: 4 +} + +function init() { +} + +function getOverviewSearchResult() { + return Main.overview._overview.controls._searchController._searchResults; +} + + +function update(reset = false) { + opt = Me.imports.settings.opt; + if (!reset && opt.RECENT_FILES_SEARCH_PROVIDER_ENABLED && !recentFilesSearchProvider) { + enable(); + } else if (reset || !opt.RECENT_FILES_SEARCH_PROVIDER_ENABLED) { + disable(); + opt = null; + } +} + +function enable() { + // delay because Fedora had problem to register a new provider soon after Shell restarts + _enableTimeoutId = GLib.timeout_add( + GLib.PRIORITY_DEFAULT, + 2000, + () => { + if (recentFilesSearchProvider == null) { + recentFilesSearchProvider = new RecentFilesSearchProvider(opt); + getOverviewSearchResult()._registerProvider(recentFilesSearchProvider); + } + _enableTimeoutId = 0; + return GLib.SOURCE_REMOVE; + } + ); +} + +function disable() { + if (recentFilesSearchProvider) { + getOverviewSearchResult()._unregisterProvider(recentFilesSearchProvider); + recentFilesSearchProvider = null; + } + if (_enableTimeoutId) { + GLib.source_remove(_enableTimeoutId); + _enableTimeoutId = 0; + } +} + +function fuzzyMatch(term, text) { + let pos = -1; + const matches = []; + // convert all accented chars to their basic form and to lower case + const _text = text;//.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(); + const _term = term.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(); + + // if term matches the substring exactly, gains the highest weight + if (_text.includes(_term)) { + return 0; + } + + for (let i = 0; i < _term.length; i++) { + let c = _term[i]; + let p; + if (pos > 0) + p = _term[i - 1]; + while (true) { + pos += 1; + if (pos >= _text.length) { + return -1; + } + if (_text[pos] == c) { + matches.push(pos); + break; + } else if (_text[pos] == p) { + matches.pop(); + matches.push(pos); + } + } + } + + // add all position to get a weight of the result + // results closer to the beginning of the text and term characters closer to each other will gain more weight. + return matches.reduce((r, p) => r + p) - matches.length * matches[0] + matches[0]; +} + +function strictMatch(term, text) { + // remove diacritics and accents from letters + let s = text.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(); + let p = term.toLowerCase(); + let ps = p.split(/ +/); + + // allows to use multiple exact patterns separated by a space in arbitrary order + for (let w of ps) { // escape regex control chars + if (!s.match(w.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))) { + return -1; + } + } + return 0; +} + +function makeResult(window, i) { + const app = Shell.WindowTracker.get_default().get_window_app(window); + const appName = app ? app.get_name() : 'Unknown'; + const windowTitle = window.get_title(); + const wsIndex = window.get_workspace().index(); + + return { + 'id': i, + // convert all accented chars to their basic form and lower case for search + 'name': `${wsIndex + 1}: ${windowTitle} ${appName}`.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(), + 'appName': appName, + 'windowTitle': windowTitle, + 'window': window + } +} + +const closeSelectedRegex = /^\/x!$/; +const closeAllResultsRegex = /^\/xa!$/; +const moveToWsRegex = /^\/m[0-9]+$/; +const moveAllToWsRegex = /^\/ma[0-9]+$/; + +var RecentFilesSearchProvider = class RecentFilesSearchProvider { + constructor(gOptions) { + this._gOptions = gOptions; + this.appInfo = Gio.AppInfo.create_from_commandline('/usr/bin/nautilus -ws recent:///', 'Recent Files', null); + //this.appInfo = Shell.AppSystem.get_default().lookup_app('org.gnome.Nautilus.desktop').appInfo; + this.appInfo.get_description = () => _('Search recent files'); + this.appInfo.get_name = () => _('Recent Files'); + this.appInfo.get_id = () => 'org.gnome.Nautilus.desktop'; + this.appInfo.get_icon = () => Gio.icon_new_for_string('document-open-recent-symbolic'); + this.appInfo.should_show = () => true; + this.title = _('Recent Files Search Provider'), + this.canLaunchSearch = true; + this.isRemoteProvider = false; + } + + _getResultSet (terms) { + if (!terms[0].startsWith(prefix)) + return []; + // do not modify original terms + let termsCopy = [...terms]; + // search for terms without prefix + termsCopy[0] = termsCopy[0].replace(prefix, ''); + + const candidates = this.files; + const _terms = [].concat(termsCopy); + let match; + + const term = _terms.join(' '); + match = (s) => { + return fuzzyMatch(term, s); + } + + const results = []; + let m; + for (let id in candidates) { + const file = this.files[id]; + const name = `${file.get_age()}d: ${file.get_display_name()} ${file.get_uri_display().replace(`\/${file.get_display_name()}`, '')}`; + if (this._gOptions.get('searchFuzzy')) { + m = fuzzyMatch(term, name); + } else { + m = strictMatch(term, name); + } + if (m !== -1) { + results.push({ weight: m, id: id}); + } + } + + results.sort((a, b) => this.files[a.id].get_visited() < this.files[b.id].get_visited()); + + this.resultIds = results.map((item) => item.id); + return this.resultIds; + } + + getResultMetas (resultIds, callback = null) { + const metas = resultIds.map((id) => this.getResultMeta(id)); + if (shellVersion >= 43) { + return new Promise(resolve => resolve(metas)); + } else { + callback(metas); + } + } + + getResultMeta (resultId) { + const result = this.files[resultId]; + return { + 'id': resultId, + 'name': `${result.get_age()}: ${result.get_display_name()}`, + 'description': `${result.get_uri_display().replace(`\/${result.get_display_name()}`, '')}`, + 'createIcon': (size) => { + let icon = this.getIcon(result, size); + return icon; + }, + } + } + + getIcon(result, size) { + let file = Gio.File.new_for_uri(result.get_uri()); + let info = file.query_info(Gio.FILE_ATTRIBUTE_THUMBNAIL_PATH, + Gio.FileQueryInfoFlags.NONE, null); + let path = info.get_attribute_byte_string( + Gio.FILE_ATTRIBUTE_THUMBNAIL_PATH); + + let icon, gicon; + + if (path) { + gicon = Gio.FileIcon.new(Gio.File.new_for_path(path)); + } else { + const appInfo = Gio.AppInfo.get_default_for_type(result.get_mime_type(), false); + if (appInfo) + gicon = appInfo.get_icon(); + } + + if (gicon) { + icon = new St.Icon({ gicon, icon_size: size }); + } else { + icon = new St.Icon({ icon_name: 'icon-missing', icon_size: size }); + } + + return icon; + } + + launchSearch(terms, timeStamp) { + this._openNautilus('recent:///') + } + + _openNautilus(uri) { + try { + GLib.spawn_command_line_async(`nautilus -ws ${uri}`); + } catch (e) { + log(e); + } + } + + activateResult (resultId, terms, timeStamp) { + const file = this.files[resultId]; + + const [,,state] = global.get_pointer(); + //const isCtrlPressed = (state & ModifierType.CONTROL_MASK) != 0; + const isShiftPressed = (state & ModifierType.SHIFT_MASK) != 0; + + if (isShiftPressed) { + Main.overview.toggle(); + this._openNautilus(file.get_uri()); + } else { + const appInfo = Gio.AppInfo.get_default_for_type(file.get_mime_type(), false); + if (!(appInfo && appInfo.launch_uris([file.get_uri()], null))) { + this._openNautilus(file.get_uri()); + } + } + } + + getInitialResultSet (terms, callback, cancellable = null) { + if (shellVersion >=43) { + cancellable = callback; + } + + const filesDict = {}; + const files = Gtk.RecentManager.get_default().get_items().filter((f)=> f.exists()); + + for (let file of files) { + filesDict[file.get_uri()] = file; + } + + this.files = filesDict; + + if (shellVersion >= 43) { + return new Promise(resolve => resolve(this._getResultSet(terms))); + } else { + callback(this._getResultSet(terms)); + } + } + + filterResults (results, maxResults) { + return results.slice(0, maxResults); + } + + getSubsearchResultSet (previousResults, terms, callback, cancellable) { + // if we return previous results, quick typers get non-actual results + callback(this._getResultSet(terms)); + } + + createResultOjbect(resultMeta) { + return this.files[resultMeta.id]; + } +} diff --git a/extensions/vertical-workspaces/schemas/org.gnome.shell.extensions.vertical-workspaces.gschema.xml b/extensions/vertical-workspaces/schemas/org.gnome.shell.extensions.vertical-workspaces.gschema.xml new file mode 100644 index 0000000..c29994d --- /dev/null +++ b/extensions/vertical-workspaces/schemas/org.gnome.shell.extensions.vertical-workspaces.gschema.xml @@ -0,0 +1,179 @@ +<?xml version="1.0" encoding="UTF-8"?> +<schemalist gettext-domain="vertical-workspaces"> + <schema id="org.gnome.shell.extensions.vertical-workspaces" path="/org/gnome/shell/extensions/vertical-workspaces/"> + <key type="i" name="ws-thumbnails-position"> + <default>0</default> + </key> + <key type="b" name="ws-thumbnails-full"> + <default>false</default> + </key> + <key type="i" name="secondary-ws-thumbnails-position"> + <default>2</default> + </key> + <key type="i" name="ws-max-spacing"> + <default>350</default> + </key> + <key type="i" name="ws-preview-scale"> + <default>100</default> + </key> + <key type="i" name="dash-position"> + <default>0</default> + </key> + <key type="i" name="dash-position-adjust"> + <default>0</default> + </key> + <key type="i" name="show-app-icon-position"> + <default>1</default> + </key> + <key type="i" name="dash-show-windows-icon"> + <default>1</default> + </key> + <key type="i" name="dash-show-recent-files-icon"> + <default>1</default> + </key> + <key type="i" name="wst-position-adjust"> + <default>0</default> + </key> + <key type="i" name="show-wst-labels"> + <default>3</default> + </key> + <key type="b" name="show-wst-labels-on-hover"> + <default>false</default> + </key> + <key type="i" name="sec-wst-position-adjust"> + <default>0</default> + </key> + <key type="b" name="center-dash-to-ws"> + <default>false</default> + </key> + <key type="b" name="show-search-entry"> + <default>false</default> + </key> + <key type="b" name="center-search"> + <default>true</default> + </key> + <key type="b" name="center-app-grid"> + <default>false</default> + </key> + <key type="i" name="ws-thumbnail-scale"> + <default>13</default> + </key> + <key type="i" name="dash-max-icon-size"> + <default>48</default> + </key> + <key type="i" name="dash-bg-opacity"> + <default>40</default> + </key> + <key type="i" name="dash-bg-radius"> + <default>0</default> + </key> + <key type="b" name="enable-page-shortcuts"> + <default>false</default> + </key> + <key type="b" name="show-ws-switcher-bg"> + <default>true</default> + </key> + <key type="b" name="show-ws-preview-bg"> + <default>false</default> + </key> + <key type="b" name="show-bg-in-overview"> + <default>true</default> + </key> + <key type="i" name="overview-bg-blur-sigma"> + <default>0</default> + </key> + <key type="i" name="app-grid-bg-blur-sigma"> + <default>40</default> + </key> + <key type="b" name="smooth-blur-transitions"> + <default>false</default> + </key> + <key type="i" name="app-grid-animation"> + <default>4</default> + </key> + <key type="i" name="search-view-animation"> + <default>4</default> + </key> + <key type="i" name="workspace-animation"> + <default>1</default> + </key> + <key type="i" name="workspace-switcher-animation"> + <default>1</default> + </key> + <key type="i" name="animation-speed-factor"> + <default>100</default> + </key> + <key type="b" name="fix-ubuntu-dock"> + <default>true</default> + </key> + <key type="i" name="win-preview-icon-size"> + <default>1</default> + </key> + <key type="b" name="always-show-win-titles"> + <default>true</default> + </key> + <key type="i" name="startup-state"> + <default>2</default> + </key> + <key type="i" name="overview-mode"> + <default>0</default> + </key> + <key type="i" name="search-icon-size"> + <default>64</default> + </key> + <key type="i" name="search-width-scale"> + <default>103</default> + </key> + <key type="b" name="app-grid-allow-custom"> + <default>false</default> + </key> + <key type="i" name="app-grid-icon-size"> + <default>80</default> + </key> + <key type="i" name="app-grid-columns"> + <default>8</default> + </key> + <key type="i" name="app-grid-rows"> + <default>4</default> + </key> + <key type="i" name="app-grid-order"> + <default>0</default> + </key> + <key type="i" name="app-grid-include-dash"> + <default>0</default> + </key> + <key type="i" name="app-grid-folder-icon-size"> + <default>80</default> + </key> + <key type="i" name="app-grid-folder-columns"> + <default>3</default> + </key> + <key type="i" name="app-grid-folder-rows"> + <default>3</default> + </key> + <key type="b" name="app-grid-incomplete-pages"> + <default>true</default> + </key> + <key type="i" name="dash-show-windows-before-activation"> + <default>1</default> + </key> + <key type="b" name="search-windows-enable"> + <default>true</default> + </key> + <key type="b" name="search-recent-files-enable"> + <default>true</default> + </key> + <key type="b" name="search-fuzzy"> + <default>false</default> + </key> + <key type="i" name="search-max-results-rows"> + <default>10</default> + </key> + <key type="i" name="panel-visibility"> + <default>0</default> + </key> + <key type="i" name="panel-position"> + <default>0</default> + </key> + </schema> +</schemalist> diff --git a/extensions/vertical-workspaces/screenshots/screenshot.jpg b/extensions/vertical-workspaces/screenshots/screenshot.jpg Binary files differnew file mode 100644 index 0000000..b10585e --- /dev/null +++ b/extensions/vertical-workspaces/screenshots/screenshot.jpg diff --git a/extensions/vertical-workspaces/screenshots/screenshot0.png b/extensions/vertical-workspaces/screenshots/screenshot0.png Binary files differnew file mode 100644 index 0000000..b6af4b9 --- /dev/null +++ b/extensions/vertical-workspaces/screenshots/screenshot0.png diff --git a/extensions/vertical-workspaces/screenshots/screenshot1.png b/extensions/vertical-workspaces/screenshots/screenshot1.png Binary files differnew file mode 100644 index 0000000..b2b10be --- /dev/null +++ b/extensions/vertical-workspaces/screenshots/screenshot1.png diff --git a/extensions/vertical-workspaces/screenshots/screenshot2.png b/extensions/vertical-workspaces/screenshots/screenshot2.png Binary files differnew file mode 100644 index 0000000..56b1ce9 --- /dev/null +++ b/extensions/vertical-workspaces/screenshots/screenshot2.png diff --git a/extensions/vertical-workspaces/screenshots/screenshot3.png b/extensions/vertical-workspaces/screenshots/screenshot3.png Binary files differnew file mode 100644 index 0000000..daa3ee5 --- /dev/null +++ b/extensions/vertical-workspaces/screenshots/screenshot3.png diff --git a/extensions/vertical-workspaces/screenshots/screenshot4.png b/extensions/vertical-workspaces/screenshots/screenshot4.png Binary files differnew file mode 100644 index 0000000..af37399 --- /dev/null +++ b/extensions/vertical-workspaces/screenshots/screenshot4.png diff --git a/extensions/vertical-workspaces/screenshots/screenshot5.png b/extensions/vertical-workspaces/screenshots/screenshot5.png Binary files differnew file mode 100644 index 0000000..8cd2a84 --- /dev/null +++ b/extensions/vertical-workspaces/screenshots/screenshot5.png diff --git a/extensions/vertical-workspaces/screenshots/vertical-workspaces.gif b/extensions/vertical-workspaces/screenshots/vertical-workspaces.gif Binary files differnew file mode 100644 index 0000000..c97c653 --- /dev/null +++ b/extensions/vertical-workspaces/screenshots/vertical-workspaces.gif diff --git a/extensions/vertical-workspaces/search.js b/extensions/vertical-workspaces/search.js new file mode 100644 index 0000000..3193eb2 --- /dev/null +++ b/extensions/vertical-workspaces/search.js @@ -0,0 +1,52 @@ +/** + * Vertical Workspaces + * search.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { Meta } = imports.gi; + +const Main = imports.ui.main; + +const Me = imports.misc.extensionUtils.getCurrentExtension(); +const _Util = Me.imports.util; + +let _overrides; +let opt; + +let SEARCH_MAX_WIDTH; + +function update(reset = false) { + opt = Me.imports.settings.opt; + _updateSearchViewWidth(reset); + + if (reset) { + Main.overview.searchEntry.visible = true; + Main.overview.searchEntry.opacity = 255; + _overrides = null; + opt = null; + return; + } +} + +function _updateSearchViewWidth(reset = false) { + const searchContent = Main.overview._overview._controls.layoutManager._searchController._searchResults._content; + if (!SEARCH_MAX_WIDTH) { // just store original value; + const themeNode = searchContent.get_theme_node(); + const width = themeNode.get_max_width(); + SEARCH_MAX_WIDTH = width; + } + + if (reset) { + searchContent.set_style(''); + } else { + let width = Math.round(SEARCH_MAX_WIDTH * opt.SEARCH_VIEW_SCALE); + searchContent.set_style(`max-width: ${width}px;`); + } +} diff --git a/extensions/vertical-workspaces/settings.js b/extensions/vertical-workspaces/settings.js new file mode 100644 index 0000000..feb285e --- /dev/null +++ b/extensions/vertical-workspaces/settings.js @@ -0,0 +1,310 @@ +/** + * Vertical Workspaces + * settings.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + */ + +'use strict'; + +const { GLib } = imports.gi; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); + +const Config = imports.misc.config; +var shellVersion = parseFloat(Config.PACKAGE_VERSION); + +const Gettext = imports.gettext.domain(Me.metadata['gettext-domain']); +var _ = Gettext.gettext; +const _schema = Me.metadata['settings-schema']; + +// common instance of Options accessible from all modules +var opt; + + +var Options = class Options { + constructor() { + this._gsettings = ExtensionUtils.getSettings(_schema); + this._connectionIds = []; + this._writeTimeoutId = 0; + this._gsettings.delay(); + this.connect('changed', () => { + if (this._writeTimeoutId) + GLib.Source.remove(this._writeTimeoutId); + + this._writeTimeoutId = GLib.timeout_add( + GLib.PRIORITY_DEFAULT, + 100, + () => { + this._gsettings.apply(); + this._updateCachedSettings(); + this._writeTimeoutId = 0; + return GLib.SOURCE_REMOVE; + } + ); + }); + this.options = { + workspaceThumbnailsPosition: ['int', 'ws-thumbnails-position'], + wsMaxSpacing: ['int', 'ws-max-spacing'], + wsPreviewScale: ['int', 'ws-preview-scale'], + WsThumbnailsFull: ['bool', 'ws-thumbnails-full'], + secondaryWsThumbnailsPosition: ['int', 'secondary-ws-thumbnails-position'], + dashPosition: ['int', 'dash-position'], + dashPositionAdjust: ['int', 'dash-position-adjust'], + wsTmbPositionAdjust: ['int', 'wst-position-adjust'], + showWsTmbLabels: ['int', 'show-wst-labels'], + showWsTmbLabelsOnHover: ['boolean', 'show-wst-labels-on-hover'], + SecWsTmbPositionAdjust: ['int', 'sec-wst-position-adjust'], + dashMaxIconSize: ['int', 'dash-max-icon-size'], + dashShowWindowsIcon: ['int', 'dash-show-windows-icon'], + dashShowRecentFilesIcon: ['int', 'dash-show-recent-files-icon'], + centerDashToWs: ['boolean', 'center-dash-to-ws'], + showAppsIconPosition: ['int', 'show-app-icon-position'], + wsThumbnailScale: ['int', 'ws-thumbnail-scale'], + showSearchEntry: ['boolean', 'show-search-entry'], + centerSearch: ['boolean', 'center-search'], + centerAppGrid: ['boolean', 'center-app-grid'], + dashBgOpacity: ['int', 'dash-bg-opacity'], + dashBgRadius: ['int', 'dash-bg-radius'], + enablePageShortcuts: ['boolean', 'enable-page-shortcuts'], + showWsSwitcherBg: ['boolean', 'show-ws-switcher-bg'], + showWsPreviewBg: ['boolean', 'show-ws-preview-bg'], + showBgInOverview: ['boolean', 'show-bg-in-overview'], + overviewBgBlurSigma: ['int', 'overview-bg-blur-sigma'], + appGridBgBlurSigma: ['int', 'app-grid-bg-blur-sigma'], + smoothBlurTransitions: ['boolean', 'smooth-blur-transitions'], + appGridAnimation: ['int', 'app-grid-animation'], + searchViewAnimation: ['int', 'search-view-animation'], + workspaceAnimation: ['int', 'workspace-animation'], + animationSpeedFactor: ['int', 'animation-speed-factor'], + fixUbuntuDock: ['boolean', 'fix-ubuntu-dock'], + winPreviewIconSize: ['int', 'win-preview-icon-size'], + alwaysShowWinTitles: ['int', 'always-show-win-titles'], + startupState: ['int', 'startup-state'], + overviewMode: ['int', 'overview-mode'], + workspaceSwitcherAnimation: ['int', 'workspace-switcher-animation'], + searchIconSize: ['int', 'search-icon-size'], + searchViewScale: ['int', 'search-width-scale'], + appGridAllowCustom: ['int', 'app-grid-allow-custom'], + appGridIconSize: ['int', 'app-grid-icon-size'], + appGridColumns: ['int', 'app-grid-columns'], + appGridRows: ['int', 'app-grid-rows'], + appGridFolderIconSize: ['int', 'app-grid-folder-icon-size'], + appGridFolderColumns: ['int', 'app-grid-folder-columns'], + appGridFolderRows: ['int', 'app-grid-folder-rows'], + appGridIncludeDash: ['int', 'app-grid-include-dash'], + appGridIncompletePages: ['boolean', 'app-grid-incomplete-pages'], + appGridOrder: ['int', 'app-grid-order'], + searchWindowsEnable: ['boolean', 'search-windows-enable'], + searchRecentFilesEnable: ['boolean', 'search-recent-files-enable'], + searchFuzzy: ['boolean', 'search-fuzzy'], + searchMaxResultsRows: ['int', 'search-max-results-rows'], + dashShowWindowsBeforeActivation: ['int', 'dash-show-windows-before-activation'], + panelVisibility: ['int', 'panel-visibility'], + panelPosition: ['int', 'panel-position'], + } + this.cachedOptions = {}; + + this.shellVersion = shellVersion; + } + + connect(name, callback) { + const id = this._gsettings.connect(name, callback); + this._connectionIds.push(id); + return id; + } + + destroy() { + this._connectionIds.forEach(id => this._gsettings.disconnect(id)); + if (this._writeTimeoutId) { + GLib.source_remove(this._writeTimeoutId); + this._writeTimeoutId = 0; + } + } + + _updateCachedSettings(settings, key) { + Object.keys(this.options).forEach(v => this.get(v, true)); + } + + get(option, updateCache = false) { + if (!this.options[option]) { + log(`[${Me.metadata.name}] Error: Option ${option} is undefined.`); + return; + } + + if (updateCache || this.cachedOptions[option] === undefined) { + const [format, key, settings] = this.options[option]; + let gSettings; + if (settings !== undefined) { + gSettings = settings(); + } else { + gSettings = this._gsettings; + } + + this.cachedOptions[option] = gSettings.get_value(key).deep_unpack(); + } + + return this.cachedOptions[option]; + } + + set(option, value) { + const [format, key, settings] = this.options[option]; + + let gSettings = this._gsettings; + + if (settings !== undefined) { + gSettings = settings(); + } + + switch (format) { + case 'boolean': + gSettings.set_boolean(key, value); + break; + case 'int': + gSettings.set_int(key, value); + break; + case 'string': + gSettings.set_string(key, value); + break; + case 'strv': + gSettings.set_strv(key, value); + break; + } + } + + getDefault(option) { + const [format, key, settings] = this.options[option]; + + let gSettings = this._gsettings; + + if (settings !== undefined) { + gSettings = settings(); + } + + return gSettings.get_default_value(key).deep_unpack(); + } + + _updateSettings(settings, key) { + this.DASH_POSITION = this.get('dashPosition', true); + this.DASH_TOP = this.DASH_POSITION === 0; + this.DASH_RIGHT = this.DASH_POSITION === 1; + this.DASH_BOTTOM = this.DASH_POSITION === 2; + this.DASH_LEFT = this.DASH_POSITION === 3; + this.DASH_VERTICAL = this.DASH_LEFT || this.DASH_RIGHT; + this.DASH_VISIBLE = this.DASH_POSITION !== 4; // 4 - disable + this.DASH_FOLLOW_RECENT_WIN = false; + + this.DASH_POSITION_ADJUSTMENT = this.get('dashPositionAdjust', true); + this.DASH_POSITION_ADJUSTMENT = this.DASH_POSITION_ADJUSTMENT * -1 / 100; // range 1 to -1 + this.CENTER_DASH_WS = this.get('centerDashToWs', true); + + this.MAX_ICON_SIZE = 64; // updates from main module + this.SHOW_WINDOWS_ICON = this.get('dashShowWindowsIcon', true); + this.SHOW_RECENT_FILES_ICON = this.get('dashShowRecentFilesIcon', true); + + this.WS_TMB_POSITION = this.get('workspaceThumbnailsPosition', true); + this.ORIENTATION = this.WS_TMB_POSITION > 4 ? 0 : 1; + this.WORKSPACE_MAX_SPACING = this.get('wsMaxSpacing', true); + //ORIENTATION || DASH_LEFT || DASH_RIGHT ? 350 : 80; + this.SHOW_WS_TMB = ![4, 9].includes(this.WS_TMB_POSITION); // 4, 9 - disable + this.WS_TMB_FULL = this.get('WsThumbnailsFull', true); + // translate ws tmb position to 0 top, 1 right, 2 bottom, 3 left + //0L 1R, 2LF, 3RF, 4DV, 5T, 6B, 7TF, 8BF, 9DH + this.WS_TMB_POSITION = [3, 1, 3, 1, 4, 0, 2, 0, 2, 8][this.WS_TMB_POSITION]; + this.WS_TMB_TOP = this.WS_TMB_POSITION === 0; + this.WS_TMB_RIGHT = this.WS_TMB_POSITION === 1; + this.WS_TMB_BOTTOM = this.WS_TMB_POSITION === 2; + this.WS_TMB_LEFT = this.WS_TMB_POSITION === 3; + this.WS_TMB_POSITION_ADJUSTMENT = this.get('wsTmbPositionAdjust', true) * -1 / 100; // range 1 to -1 + this.SEC_WS_TMB_POSITION = this.get('secondaryWsThumbnailsPosition', true); + this.SEC_WS_TMB_TOP = (this.SEC_WS_TMB_POSITION === 0 && !this.ORIENTATION) || (this.SEC_WS_TMB_POSITION === 2 && this.WS_TMB_TOP); + this.SEC_WS_TMB_RIGHT = (this.SEC_WS_TMB_POSITION === 1 && this.ORIENTATION) || (this.SEC_WS_TMB_POSITION === 2 && this.WS_TMB_RIGHT); + this.SEC_WS_TMB_BOTTOM = (this.SEC_WS_TMB_POSITION === 1 && !this.ORIENTATION) || (this.SEC_WS_TMB_POSITION === 2 && this.WS_TMB_BOTTOM); + this.SEC_WS_TMB_LEFT = (this.SEC_WS_TMB_POSITION === 0 && this.ORIENTATION) || (this.SEC_WS_TMB_POSITION === 2 && this.WS_TMB_LEFT); + + this.SEC_WS_TMB_POSITION_ADJUSTMENT = this.get('SecWsTmbPositionAdjust', true) * -1 / 100; // range 1 to -1 + this.SHOW_WST_LABELS = this.get('showWsTmbLabels', true); + this.SHOW_WST_LABELS_ON_HOVER = this.get('showWsTmbLabelsOnHover', true); + + this.MAX_THUMBNAIL_SCALE = this.get('wsThumbnailScale', true) / 100; + + this.WS_PREVIEW_SCALE = this.get('wsPreviewScale', true) / 100; + // calculate number of possibly visible neighbor previews according to ws scale + this.NUMBER_OF_VISIBLE_NEIGHBORS = Math.round(1 + (100 - this.WS_PREVIEW_SCALE) / 40); + + this.SHOW_WS_TMB_BG = this.get('showWsSwitcherBg', true) && this.SHOW_WS_TMB; + this.SHOW_WS_PREVIEW_BG = this.get('showWsPreviewBg', true); + + this.CENTER_APP_GRID = this.get('centerAppGrid', true); + + this.SHOW_SEARCH_ENTRY = this.get('showSearchEntry', true); + this.CENTER_SEARCH_VIEW = this.get('centerSearch', true); + this.APP_GRID_ANIMATION = this.get('appGridAnimation', true); + if (this.APP_GRID_ANIMATION === 4) { + this.APP_GRID_ANIMATION = this._getAnimationDirection(); + } + this.SEARCH_VIEW_ANIMATION = this.get('searchViewAnimation', true); + if (this.SEARCH_VIEW_ANIMATION === 4) { + this.SEARCH_VIEW_ANIMATION = 3; + } + this.WS_ANIMATION = this.get('workspaceAnimation', true); + + this.WIN_PREVIEW_ICON_SIZE = [64, 48, 32, 22, 8][this.get('winPreviewIconSize', true)]; + this.ALWAYS_SHOW_WIN_TITLES = this.get('alwaysShowWinTitles', true); + + this.STARTUP_STATE = this.get('startupState', true); + this.SHOW_BG_IN_OVERVIEW = this.get('showBgInOverview', true); + this.OVERVIEW_BG_BLUR_SIGMA = this.get('overviewBgBlurSigma', true); + this.APP_GRID_BG_BLUR_SIGMA = this.get('appGridBgBlurSigma', true); + this.SMOOTH_BLUR_TRANSITIONS = this.get('smoothBlurTransitions', true); + + this.OVERVIEW_MODE = this.get('overviewMode', true); + this.OVERVIEW_MODE2 = this.OVERVIEW_MODE === 2; + this.WORKSPACE_MODE = this.OVERVIEW_MODE ? 0 : 1; + //Workspace.WINDOW_PREVIEW_MAXIMUM_SCALE = 0.95; + + this.STATIC_WS_SWITCHER_BG = this.get('workspaceSwitcherAnimation', true); + + this.ANIMATION_TIME_FACTOR = this.get('animationSpeedFactor', true) / 100; + //St.Settings.get().slow_down_factor = this.ANIMATION_TIME_FACTOR; + + this.SEARCH_ICON_SIZE = this.get('searchIconSize', true); + this.SEARCH_VIEW_SCALE = this.get('searchViewScale', true) / 100; + this.SEARCH_MAX_ROWS = this.get('searchMaxResultsRows', true); + //imports.ui.search.MAX_LIST_SEARCH_RESULTS_ROWS = this.SEARCH_MAX_ROWS; + + this.APP_GRID_ALLOW_INCOMPLETE_PAGES = false; + this.APP_GRID_ALLOW_CUSTOM = this.get('appGridAllowCustom', true); + this.APP_GRID_ICON_SIZE = this.get('appGridIconSize', true); + this.APP_GRID_COLUMNS = this.get('appGridColumns', true); + this.APP_GRID_ROWS = this.get('appGridRows', true); + this.APP_GRID_ORDER = this.get('appGridOrder', true); + this.APP_GRID_INCLUDE_DASH = this.get('appGridIncludeDash', true); + + this.APP_GRID_FOLDER_ICON_SIZE = this.get('appGridFolderIconSize', true); + this.APP_GRID_FOLDER_COLUMNS = this.get('appGridFolderColumns', true); + this.APP_GRID_FOLDER_ROWS = this.get('appGridFolderRows', true); + + this.DASH_SHOW_WINS_BEFORE = this.get('dashShowWindowsBeforeActivation', true); + this.DASH_SHIFT_CLICK_MV = true; + + this.WINDOW_SEARCH_PROVIDER_ENABLED = this.get('searchWindowsEnable', true); + this.RECENT_FILES_SEARCH_PROVIDER_ENABLED = this.get('searchRecentFilesEnable', true); + + this.PANEL_POSITION_TOP = this.get('panelPosition', true) === 0; + this.PANEL_MODE = this.get('panelVisibility', true); + this.START_Y_OFFSET = 0; // set from main module + } + + _getAnimationDirection() { + if (this.ORIENTATION) { + return (this.WS_TMB_LEFT || !this.SHOW_WS_TMB) ? 1 : 2; // 1 right, 2 left + } else { + return (this.WS_TMB_TOP || !this.SHOW_WS_TMB) ? 3 : 5; // 3 bottom, 5 top + } + } + +}; diff --git a/extensions/vertical-workspaces/stylesheet.css b/extensions/vertical-workspaces/stylesheet.css new file mode 100644 index 0000000..b43c192 --- /dev/null +++ b/extensions/vertical-workspaces/stylesheet.css @@ -0,0 +1,167 @@ +/* General dash */ +#dash.vertical-overview { + margin-right: 0px; + margin-left: 0px; + padding: 0px 0; +} + +#dash.vertical-overview .app-well-app, +#dash.vertical-overview .show-apps { + padding-right: 8px; + padding-left: 8px; + /*spacing between icons*/ + padding-top: 1px; + padding-bottom: 1px; + margin: 0px; +} + +#dash.vertical-overview .dash-separator { + height: 1px; + margin-right: 2px; + margin-left: 2px; + margin-top: 4px; + margin-bottom: 4px; + background-color: transparentize(#eeeeec, 0.7); +} + +#dash.vertical-overview .overview-icon { + padding: 5px 0; +} + +#dash.vertical-overview .app-well-app-running-dot { + margin: 4px 0px; + width: 2px; + height: 16px; +} + +#dash.vertical-overview .dash-background { + margin: 0; +} + +#dash.vertical-overview-left .dash-background { + border-radius: 0 18px 18px 0; + border-left: 0px; + padding: 8px 12px 8px 4px; +} + +#dash.vertical-overview-right .dash-background { + border-radius: 18px 0 0 18px; + border-right: 0px; + padding: 8px 4px 8px 12px; +} + +/* default horizontal dash */ +.dash-background { + padding: 6px; + border-radius: 17px; +} + +.app-well-app { + margin-left: 1px; + margin-right: 1px; +} + +.app-well-app-running-dot { + margin-bottom: 6px; + width: 16px; + height: 2px; +} + +/* add shadow to the app grid app label to be readable if it overlaps light icon below */ +.overview-icon-with-label { + text-shadow: 1px 1px 3px rgba(33, 33, 33, 1); +} + +.search-entry { + padding: 3px; + padding-left: 5px; + padding-right: 5px; +} + +/*adjustment for the vertical ws switcher indicator popup*/ +.ws-switcher-indicator { + padding: 3px; + margin: 5px; +} + +.ws-switcher-indicator:active { + padding: 5px; + margin: 3px; +} + +/*ws thumbnails captions*/ +.ws-tmb-label { + padding: 2px; + color: rgb(255, 255, 255); + background-color: rgba(10,10,10,0.8); + text-align: center; +} + +.ws-tmb, .ws-tmb-labeled { + border-radius: 6px; +} + +.ws-tmb-labeled { + border: 0px; +} + +/*app grid page indicatos*/ +.page-indicator-icon { + margin: 10px 10px 10px 10px; +} + +.page-indicator { + padding: 0px; +} + +/* GS 43 App Grid - indicators that show up when dragging icon */ +.prevPageIndicator { + background: rgba(255, 255, 255, 0.1); + background-gradient-start: rgba(255, 255, 255, 0.1); + background-gradient-end: transparent; + background-gradient-direction: vertical; + border-radius: 100px 100px 0px 0px; +} +.nextPageIndicator { + background: rgba(255, 255, 255, 0.1); + background-gradient-start: transparent; + background-gradient-end: rgba(255, 255, 255, 0.1); + background-gradient-direction: vertical; + border-radius: 0px 0px 100px 100px; + +} + +.search-section-content { + background-color: rgba(20, 20, 20, 0.8); + color: white; +} + +.transparent-panel { + background-color: transparent; +} + +/*reduce spacing between app icons in search results*/ +.grid-search-results { + spacing: 2px; +} + +/*.panel { + text-shadow: 1px 1px 3px rgba(33, 33, 33, 1); +}*/ + +/* hide vertical scroll bar, it's distracting in the search results */ +StButton#vhandle { + background-color: transparent; +} + +.show-apps-icon-horizontal-hide { + width: 0; + margin: 0; + spacing: 0; +} + +.show-apps-icon-vertical-hide { + height: 0; + margin: 0; + spacing: 0; +} diff --git a/extensions/vertical-workspaces/swipeTracker.js b/extensions/vertical-workspaces/swipeTracker.js new file mode 100644 index 0000000..d5c52da --- /dev/null +++ b/extensions/vertical-workspaces/swipeTracker.js @@ -0,0 +1,79 @@ +/** + * Vertical Workspaces + * swipeTracker.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { Clutter, GObject } = imports.gi; +const Main = imports.ui.main; +const SwipeTracker = imports.ui.swipeTracker; + +const Me = imports.misc.extensionUtils.getCurrentExtension(); +let opt; + +let _vwGestureUpdateId; +let _originalGestureUpdateId; + +function update(reset = false) { + opt = Me.imports.settings.opt; + + if (reset || !opt.ORIENTATION) { // 1-VERTICAL, 0-HORIZONTAL + // original swipeTrackers' orientation and updateGesture function + Main.overview._swipeTracker.orientation = Clutter.Orientation.VERTICAL; + Main.wm._workspaceAnimation._swipeTracker.orientation = Clutter.Orientation.HORIZONTAL; + Main.overview._swipeTracker._updateGesture = SwipeTracker.SwipeTracker.prototype._updateGesture; + if (_vwGestureUpdateId) { + Main.overview._swipeTracker._touchpadGesture.disconnect(_vwGestureUpdateId); + _vwGestureUpdateId = 0; + } + if (_originalGestureUpdateId) { + Main.overview._swipeTracker._touchpadGesture.unblock_signal_handler(_originalGestureUpdateId); + _originalGestureUpdateId = 0; + } + + opt = null; + return; + } + + if (opt.ORIENTATION) { // 1-VERTICAL, 0-HORIZONTAL + // reverse swipe gestures for enter/leave overview and ws switching + Main.overview._swipeTracker.orientation = Clutter.Orientation.HORIZONTAL; + Main.wm._workspaceAnimation._swipeTracker.orientation = Clutter.Orientation.VERTICAL; + // overview's updateGesture() function should reflect ws tmb position to match appGrid/ws animation direction + // function in connection cannot be overridden in prototype of its class because connected is actually another copy of the original function + if (!_originalGestureUpdateId) { + _originalGestureUpdateId = GObject.signal_handler_find(Main.overview._swipeTracker._touchpadGesture, { signalId: 'update' }); + Main.overview._swipeTracker._touchpadGesture.block_signal_handler(_originalGestureUpdateId); + Main.overview._swipeTracker._updateGesture = SwipeTrackerVertical._updateGesture; + _vwGestureUpdateId = Main.overview._swipeTracker._touchpadGesture.connect('update', SwipeTrackerVertical._updateGesture.bind(Main.overview._swipeTracker)); + } + } +} + +//---- SwipeTracker ----------------------------------------------------------------------------------- +// switch overview's state gesture direction +var SwipeTrackerVertical = { + _updateGesture: function(gesture, time, delta, distance) { + if (this._state !== 1) //State.SCROLLING) + return; + + if ((this._allowedModes & Main.actionMode) === 0 || !this.enabled) { + this._interrupt(); + return; + } + + if (opt.WS_TMB_RIGHT) + delta = -delta; + this._progress += delta / distance; + this._history.append(time, delta); + + this._progress = Math.clamp(this._progress, ...this._getBounds(this._initialProgress)); + this.emit('update', this._progress); + } +} diff --git a/extensions/vertical-workspaces/util.js b/extensions/vertical-workspaces/util.js new file mode 100644 index 0000000..e0a625b --- /dev/null +++ b/extensions/vertical-workspaces/util.js @@ -0,0 +1,270 @@ +/** + * Vertical Workspaces + * util.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const Gi = imports._gi; +const { Shell, Meta } = imports.gi; + +const Config = imports.misc.config; +const Main = imports.ui.main; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); + +var shellVersion = parseFloat(Config.PACKAGE_VERSION); + +var Overrides = class { + constructor() { + this._overrides = {}; + this._injections = {}; + } + + addOverride(name, prototype, overrideList) { + this._overrides[name] = { + originals: this.overrideProto(prototype, overrideList), + prototype, + }; + } + + removeOverride(name) { + const override = this._overrides[name]; + if (!override) + return false; + + this.overrideProto(override.prototype, override.originals); + this._overrides[name] = undefined; + return true; + } + + /* + className.prototype + .injections.funcName1 + .funcName2 + */ + addInjection(className, prototype, injections) { + if (!this._injections[className]) + this._injections[className] = { + prototype, + injections: {}, + }; + + for (let name in injections) { + this._injections[className].injections[name] = { + original: this.injectToFunction(prototype, name, injections[name]), + } + } + } + + removeInjection(className, funcName) { + if (this._injections[className]) return false; + const prototype = this._injections[className].prototype; + + const injection = this._injections[className].injections[funcName]; + if (!injection) return false; + + prototype[funcName] = injection.original; + this._injections[funcName] = undefined; + return true; + } + + removeAll() { + for (let name in this._overrides) { + this.removeOverride(name); + this._overrides[name] = undefined; + } + + for (let className in this._injections) { + const injt = this._injections[className]; + const prototype = injt.prototype; + for (let funcName in injt.injections) { + prototype[funcName] = injt.injections[funcName].original; + } + this._injections[className] = undefined; + } + } + + hookVfunc(proto, symbol, func) { + proto[Gi.hook_up_vfunc_symbol](symbol, func); + } + + overrideProto(proto, overrides) { + const backup = {}; + + for (let symbol in overrides) { + if (symbol.startsWith('after_')) { + const actualSymbol = symbol.slice('after_'.length); + const fn = proto[actualSymbol]; + const afterFn = overrides[symbol] + proto[actualSymbol] = function() { + const args = Array.prototype.slice.call(arguments); + const res = fn.apply(this, args); + afterFn.apply(this, args); + return res; + }; + backup[actualSymbol] = fn; + } + else { + backup[symbol] = proto[symbol]; + if (symbol.startsWith('vfunc')) { + if (shellVersion < 42) { + this.hookVfunc(proto, symbol.slice(6), overrides[symbol]); + } else { + this.hookVfunc(proto[Gi.gobject_prototype_symbol], symbol.slice(6), overrides[symbol]); + } + } + else { + proto[symbol] = overrides[symbol]; + } + } + } + return backup; + } + + injectToFunction(parent, name, func) { + let origin = parent[name]; + parent[name] = function() { + let ret; + ret = origin.apply(this, arguments); + func.apply(this, arguments); + return ret; + } + + return origin; + } +} + +//------- Common functions ----------------------------------------------------------------------- + +function getOverviewTranslations(opt, dash, tmbBox, searchEntryBin) { + //const tmbBox = Main.overview._overview._controls._thumbnailsBox; + let searchTranslation_y = 0; + if (searchEntryBin.visible) { + const offset = (dash.visible && (!opt.DASH_VERTICAL ? dash.height + 12 : 0)) + + (opt.WS_TMB_TOP ? tmbBox.height + 12 : 0); + searchTranslation_y = - searchEntryBin.height - offset - 30; + } + + let tmbTranslation_x = 0; + let tmbTranslation_y = 0; + let offset; + if (tmbBox.visible) { + switch (opt.WS_TMB_POSITION) { + case 3: // left + offset = 10 + ((dash?.visible && opt.DASH_LEFT) ? dash.width : 0); + tmbTranslation_x = - tmbBox.width - offset; + tmbTranslation_y = 0; + break; + case 1: // right + offset = 10 + ((dash?.visible && opt.DASH_RIGHT) ? dash.width : 0); + tmbTranslation_x = tmbBox.width + offset; + tmbTranslation_y = 0; + break; + case 0: // top + offset = 10 + ((dash?.visible && opt.DASH_TOP) ? dash.height : 0) + Main.panel.height; + tmbTranslation_x = 0; + tmbTranslation_y = - tmbBox.height - offset; + break; + case 2: // bottom + offset = 10 + ((dash?.visible && opt.DASH_BOTTOM) ? dash.height : 0) + Main.panel.height; // just for case the panel is at bottom + tmbTranslation_x = 0; + tmbTranslation_y = tmbBox.height + offset; + break; + } + } + + let dashTranslation_x = 0; + let dashTranslation_y = 0; + let position = opt.DASH_POSITION; + // if DtD replaced the original Dash, read its position + if (dashIsDashToDock()) { + position = dash._position; + } + if (dash?.visible) { + switch (position) { + case 0: // top + dashTranslation_x = 0; + dashTranslation_y = - dash.height - dash.margin_bottom - Main.panel.height; + break; + case 1: // right + dashTranslation_x = dash.width; + dashTranslation_y = 0; + break; + case 2: // bottom + dashTranslation_x = 0; + dashTranslation_y = dash.height + dash.margin_bottom + Main.panel.height; + break; + case 3: // left + dashTranslation_x = - dash.width; + dashTranslation_y = 0; + break; + } + } + + return [tmbTranslation_x, tmbTranslation_y, dashTranslation_x, dashTranslation_y, searchTranslation_y]; +} + +function openPreferences() { + const windows = global.display.get_tab_list(Meta.TabList.NORMAL_ALL, null); + let tracker = Shell.WindowTracker.get_default(); + let metaWin, isVW = null; + + for (let win of windows) { + const app = tracker.get_window_app(win); + if (win.get_title().includes(Me.metadata.name) && app.get_name() === 'Extensions') { + // this is our existing window + metaWin = win; + isVW = true; + break; + } else if (win.wm_class.includes('org.gnome.Shell.Extensions')) { + // this is prefs window of another extension + metaWin = win; + isVW = false; + } + } + + if (metaWin && !isVW) { + // other prefs window blocks opening another prefs window, so close it + metaWin.delete(global.get_current_time()); + } else if (metaWin && isVW) { + // if prefs window already exist, move it to the current WS and activate it + metaWin.change_workspace(global.workspace_manager.get_active_workspace()); + metaWin.activate(global.get_current_time()); + } + + if (!metaWin || (metaWin && !isVW)) { + try { + Main.extensionManager.openExtensionPrefs(Me.metadata.uuid, '', {}); + } catch (e) { + log(e); + } + } +} + +function activateSearchProvider(prefix = '') { + const searchEntry = Main.overview.searchEntry; + if (!searchEntry.get_text() || !searchEntry.get_text().startsWith(prefix)) { + prefix = _(prefix + ' '); + const position = prefix.length; + searchEntry.set_text(prefix); + searchEntry.get_first_child().set_cursor_position(position); + searchEntry.get_first_child().set_selection(position, position); + } else { + searchEntry.set_text(''); + } +} + +function dashNotDefault() { + return Main.overview.dash !== Main.overview._overview._controls.layoutManager._dash; +} + +function dashIsDashToDock() { + return Main.overview.dash._isHorizontal !== undefined; +} diff --git a/extensions/vertical-workspaces/windowManager.js b/extensions/vertical-workspaces/windowManager.js new file mode 100644 index 0000000..e931a67 --- /dev/null +++ b/extensions/vertical-workspaces/windowManager.js @@ -0,0 +1,208 @@ +/** + * Vertical Workspaces + * windowManager.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { GObject, Clutter, Meta, Shell } = imports.gi; + +const Main = imports.ui.main; +const WindowManager = imports.ui.windowManager; +const Me = imports.misc.extensionUtils.getCurrentExtension(); +const _Util = Me.imports.util; +let _overrides; + +const MINIMIZE_WINDOW_ANIMATION_TIME = WindowManager.MINIMIZE_WINDOW_ANIMATION_TIME; +const MINIMIZE_WINDOW_ANIMATION_MODE = WindowManager.MINIMIZE_WINDOW_ANIMATION_MODE; + +let opt; + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + _replaceMinimizeFunction(reset); + + if (reset) { + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + + _overrides = new _Util.Overrides(); + + _overrides.addOverride('WindowManager', WindowManager.WindowManager.prototype, WindowManagerCommon); +} + +//------------- Fix and adapt minimize/unminimize animations -------------------------------------- + +let _originalMinimizeSigId; +let _minimizeSigId; +let _originalUnminimizeSigId; +let _unminimizeSigId; + +function _replaceMinimizeFunction(reset = false) { + if (reset) { + Main.wm._shellwm.disconnect(_minimizeSigId); + _minimizeSigId = 0; + Main.wm._shellwm.unblock_signal_handler(_originalMinimizeSigId); + _originalMinimizeSigId = 0; + + Main.wm._shellwm.disconnect(_unminimizeSigId); + _unminimizeSigId = 0; + Main.wm._shellwm.unblock_signal_handler(_originalUnminimizeSigId); + _originalUnminimizeSigId = 0; + + } else if (!_minimizeSigId) { + _originalMinimizeSigId = GObject.signal_handler_find(Main.wm._shellwm, { signalId: 'minimize' }); + if (_originalMinimizeSigId) { + Main.wm._shellwm.block_signal_handler(_originalMinimizeSigId); + _minimizeSigId = Main.wm._shellwm.connect('minimize', WindowManagerCommon._minimizeWindow.bind(Main.wm)); + } + + _originalUnminimizeSigId = GObject.signal_handler_find(Main.wm._shellwm, { signalId: 'unminimize' }); + if (_originalUnminimizeSigId) { + Main.wm._shellwm.block_signal_handler(_originalUnminimizeSigId); + _unminimizeSigId = Main.wm._shellwm.connect('unminimize', WindowManagerCommon._unminimizeWindow.bind(Main.wm)); + } + } +} + +// fix for mainstream bug - fullscreen windows should minimize using opacity transition +// but its being applied directly on window actor and that doesn't work +// anyway, animation is better, even if the Activities button is not visible... +// and also add support for bottom position of the panel +const WindowManagerCommon = { + _minimizeWindow: function(shellwm, actor) { + const types = [ + Meta.WindowType.NORMAL, + Meta.WindowType.MODAL_DIALOG, + Meta.WindowType.DIALOG, + ]; + if (!this._shouldAnimateActor(actor, types)) { + shellwm.completed_minimize(actor); + return; + } + + actor.set_scale(1.0, 1.0); + + this._minimizing.add(actor); + + if (false/*actor.meta_window.is_monitor_sized()*/) { + actor.get_first_child().ease({ + opacity: 0, + duration: MINIMIZE_WINDOW_ANIMATION_TIME, + mode: MINIMIZE_WINDOW_ANIMATION_MODE, + onStopped: () => this._minimizeWindowDone(shellwm, actor), + }); + } else { + let xDest, yDest, xScale, yScale; + let [success, geom] = actor.meta_window.get_icon_geometry(); + if (success) { + xDest = geom.x; + yDest = geom.y; + xScale = geom.width / actor.width; + yScale = geom.height / actor.height; + } else { + let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()]; + if (!monitor) { + this._minimizeWindowDone(); + return; + } + xDest = monitor.x; + yDest = opt.PANEL_POSITION_TOP ? monitor.y : monitor.y + monitor.height; + if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) + xDest += monitor.width; + xScale = 0; + yScale = 0; + } + + actor.ease({ + scale_x: xScale, + scale_y: yScale, + x: xDest, + y: yDest, + duration: MINIMIZE_WINDOW_ANIMATION_TIME, + mode: MINIMIZE_WINDOW_ANIMATION_MODE, + onStopped: () => this._minimizeWindowDone(shellwm, actor), + }); + } + }, + + _minimizeWindowDone: function(shellwm, actor) { + if (this._minimizing.delete(actor)) { + actor.remove_all_transitions(); + actor.set_scale(1.0, 1.0); + actor.get_first_child().set_opacity(255); + actor.set_pivot_point(0, 0); + + shellwm.completed_minimize(actor); + } + }, + + _unminimizeWindow: function(shellwm, actor) { + const types = [ + Meta.WindowType.NORMAL, + Meta.WindowType.MODAL_DIALOG, + Meta.WindowType.DIALOG, + ]; + if (!this._shouldAnimateActor(actor, types)) { + shellwm.completed_unminimize(actor); + return; + } + + this._unminimizing.add(actor); + + if (false/*actor.meta_window.is_monitor_sized()*/) { + actor.opacity = 0; + actor.set_scale(1.0, 1.0); + actor.ease({ + opacity: 255, + duration: MINIMIZE_WINDOW_ANIMATION_TIME, + mode: MINIMIZE_WINDOW_ANIMATION_MODE, + onStopped: () => this._unminimizeWindowDone(shellwm, actor), + }); + } else { + let [success, geom] = actor.meta_window.get_icon_geometry(); + if (success) { + actor.set_position(geom.x, geom.y); + actor.set_scale(geom.width / actor.width, + geom.height / actor.height); + } else { + let monitor = Main.layoutManager.monitors[actor.meta_window.get_monitor()]; + if (!monitor) { + actor.show(); + this._unminimizeWindowDone(); + return; + } + actor.set_position(monitor.x, opt.PANEL_POSITION_TOP ? monitor.y : monitor.y + monitor.height); + if (Clutter.get_default_text_direction() == Clutter.TextDirection.RTL) + actor.x += monitor.width; + actor.set_scale(0, 0); + } + + let rect = actor.meta_window.get_buffer_rect(); + let [xDest, yDest] = [rect.x, rect.y]; + + actor.show(); + actor.ease({ + scale_x: 1, + scale_y: 1, + x: xDest, + y: yDest, + duration: MINIMIZE_WINDOW_ANIMATION_TIME, + mode: MINIMIZE_WINDOW_ANIMATION_MODE, + onStopped: () => this._unminimizeWindowDone(shellwm, actor), + }); + } + } +} diff --git a/extensions/vertical-workspaces/windowPreview.js b/extensions/vertical-workspaces/windowPreview.js new file mode 100644 index 0000000..013f48c --- /dev/null +++ b/extensions/vertical-workspaces/windowPreview.js @@ -0,0 +1,335 @@ +/** + * Vertical Workspaces + * windowPreview.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { Clutter, GLib, Graphene, Meta, Shell, St } = imports.gi; + +const Main = imports.ui.main; +const WindowPreview = imports.ui.windowPreview; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); + +const _Util = Me.imports.util; +let _overrides; + +const WINDOW_SCALE_TIME = imports.ui.windowPreview.WINDOW_SCALE_TIME; +const WINDOW_ACTIVE_SIZE_INC = imports.ui.windowPreview.WINDOW_ACTIVE_SIZE_INC; +const WINDOW_OVERLAY_FADE_TIME = imports.ui.windowPreview.WINDOW_OVERLAY_FADE_TIME; +const SEARCH_WINDOWS_PREFIX = Me.imports.windowSearchProvider.prefix; + +const ControlsState = imports.ui.overviewControls.ControlsState; + +var opt = null; + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + if (reset) { + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + _overrides = new _Util.Overrides(); + + _overrides.addOverride('WindowPreview', WindowPreview.WindowPreview.prototype, WindowPreviewCommon); + // move titles into window previews + _overrides.addInjection('WindowPreview', WindowPreview.WindowPreview.prototype, WindowPreviewInjections); +} + +//----- WindowPreview ------------------------------------------------------------------ +var WindowPreviewInjections = { + _init: function() { + const ICON_OVERLAP = 0.7; + + if (opt.WIN_PREVIEW_ICON_SIZE < 64) { + this.remove_child(this._icon); + this._icon.destroy(); + const tracker = Shell.WindowTracker.get_default(); + const app = tracker.get_window_app(this.metaWindow); + this._icon = app.create_icon_texture(opt.WIN_PREVIEW_ICON_SIZE); + this._icon.add_style_class_name('icon-dropshadow'); + this._icon.set({ + reactive: true, + pivot_point: new Graphene.Point({ x: 0.5, y: 0.5 }), + }); + this._icon.add_constraint(new Clutter.BindConstraint({ + source: this.windowContainer, + coordinate: Clutter.BindCoordinate.POSITION, + })); + this._icon.add_constraint(new Clutter.AlignConstraint({ + source: this.windowContainer, + align_axis: Clutter.AlignAxis.X_AXIS, + factor: 0.5, + })); + this._icon.add_constraint(new Clutter.AlignConstraint({ + source: this.windowContainer, + align_axis: Clutter.AlignAxis.Y_AXIS, + pivot_point: new Graphene.Point({ x: -1, y: ICON_OVERLAP }), + factor: 1, + })); + this.add_child(this._icon); + if (opt.WIN_PREVIEW_ICON_SIZE < 22) { + // disable app icon + this._icon.hide(); + } + this._iconSize = opt.WIN_PREVIEW_ICON_SIZE; + } + + const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage); + const iconOverlap = opt.WIN_PREVIEW_ICON_SIZE * ICON_OVERLAP; + // we cannot get proper title height before it gets to the stage, so 35 is estimated height + spacing + this._title.get_constraints()[1].offset = scaleFactor * (- iconOverlap - 35); + this.set_child_above_sibling(this._title, null); + // if window is created while the overview is shown, icon and title should be visible immediately + if (Main.overview._overview._controls._stateAdjustment.value < 1) { + this._icon.scale_x = 0; + this._icon.scale_y = 0; + this._title.opacity = 0; + } + + if (opt.ALWAYS_SHOW_WIN_TITLES) { + this._title.show(); + this._stateConId = this._workspace._background._stateAdjustment.connect('notify::value', (adj) => { + this._title.opacity = Math.floor(adj.value) * 255; + }); + + } + + if (opt.OVERVIEW_MODE === 1) { + // spread windows on hover + this._wsStateConId = this.connect('enter-event', () => { + // don't spread windows if user don't use pointer device at this moment + if (global.get_pointer()[0] === opt.showingPointerX) + return; + + const adjustment = this._workspace._background._stateAdjustment; + if (!adjustment.value && !Main.overview._animationInProgress) { + opt.WORKSPACE_MODE = 1; + if (adjustment.value === 0) { + adjustment.value = 0; + adjustment.ease(1, { + duration: 200, + mode: Clutter.AnimationMode.EASE_OUT_QUAD + }); + } + } + }); + } + if (opt.OVERVIEW_MODE) { + // show window icon and title on ws windows spread + this._stateAdjustmentSigId = this._workspace.stateAdjustment.connect('notify::value', this._updateIconScale.bind(this)); + } + + // replace click action with custom one + const action = this.get_actions()[0]; + this.remove_action(action); + + const clickAction = new Clutter.ClickAction(); + clickAction.connect('clicked', (action) => { + const button = action.get_button(); + if (button === Clutter.BUTTON_PRIMARY) { + this._activate(); + } else if (button === Clutter.BUTTON_SECONDARY) { + // this action cancels long-press event and the 'long-press-cancel' event is used by the Shell to actually initiate DnD + // so the dnd initiation needs to be removed + if (this._longPressLater) { + Meta.later_remove(this._longPressLater); + delete this._longPressLater; + } + const tracker = Shell.WindowTracker.get_default(); + const appName = tracker.get_window_app(this.metaWindow).get_name(); + _Util.activateSearchProvider(`${SEARCH_WINDOWS_PREFIX} ${appName}`); + return Clutter.EVENT_STOP; + } + }); + + clickAction.connect('long-press', this._onLongPress.bind(this)); + this.add_action(clickAction); + + this.connect('destroy', () => this._workspace.stateAdjustment.disconnect(this._stateConId)); + } +} + +// WindowPreview +var WindowPreviewCommon = { + _updateIconScale: function() { + let { currentState, initialState, finalState } = + this._overviewAdjustment.getStateTransitionParams(); + + // Current state - 0 - HIDDEN, 1 - WINDOW_PICKER, 2 - APP_GRID + const primaryMonitor = this.metaWindow.get_monitor() === global.display.get_primary_monitor(); + + const visible = + (initialState > ControlsState.HIDDEN || finalState > ControlsState.HIDDEN) + && !(finalState === ControlsState.APP_GRID && primaryMonitor); + + let scale = visible + ? (currentState >= 1 ? 1 : currentState % 1) : 0; + if (!primaryMonitor && + ((initialState === ControlsState.WINDOW_PICKER && finalState === ControlsState.APP_GRID) || + (initialState === ControlsState.APP_GRID && finalState === ControlsState.WINDOW_PICKER)) + ) { + scale = 1; + /*} else if (primaryMonitor && ((initialState === ControlsState.WINDOW_PICKER && finalState === ControlsState.APP_GRID) || + initialState === ControlsState.APP_GRID && finalState === ControlsState.HIDDEN)) {*/ + } else if (primaryMonitor && currentState > ControlsState.WINDOW_PICKER) { + scale = 0; + } + + // in static workspace mode show icon and title on ws windows spread + if (opt.OVERVIEW_MODE) { + const windowsSpread = this._workspace.stateAdjustment.value; + if (currentState === 1) { + scale = windowsSpread; + } else if (finalState === 1 || (finalState === 0 && !windowsSpread)) { + return; + } + } + + this._icon.set({ + scale_x: scale, + scale_y: scale, + }); + + // if titles are in 'always show' mode, we need to add transition between visible/invisible state + // but the transition is quite expensive, + // showing the titles at the end of the transition is good enough and workspace preview transition is much smoother + this._title.set({ + opacity: Math.floor(scale) * 255, + }); + }, + + showOverlay: function(animate) { + if (!this._overlayEnabled) + return; + + if (this._overlayShown) + return; + + this._overlayShown = true; + //this._restack(); + + // If we're supposed to animate and an animation in our direction + // is already happening, let that one continue + const ongoingTransition = this._title.get_transition('opacity'); + if (animate && + ongoingTransition && + ongoingTransition.get_interval().peek_final_value() === 255) + return; + + const toShow = this._windowCanClose() + ? [this._closeButton] + : []; + + if (!opt.ALWAYS_SHOW_WIN_TITLES) { + toShow.push(this._title); + } + + toShow.forEach(a => { + a.opacity = 0; + a.show(); + a.ease({ + opacity: 255, + duration: animate ? WINDOW_OVERLAY_FADE_TIME : 0, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + }); + + const [width, height] = this.window_container.get_size(); + const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage); + const activeExtraSize = WINDOW_ACTIVE_SIZE_INC * 2 * scaleFactor; + const origSize = Math.max(width, height); + const scale = (origSize + activeExtraSize) / origSize; + + this.window_container.ease({ + scale_x: scale, + scale_y: scale, + duration: animate ? WINDOW_SCALE_TIME : 0, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + + this.emit('show-chrome'); + }, + + hideOverlay: function(animate) { + if (!this._overlayShown) + return; + this._overlayShown = false; + //this._restack(); + + // If we're supposed to animate and an animation in our direction + // is already happening, let that one continue + const ongoingTransition = this._title.get_transition('opacity'); + if (animate && + ongoingTransition && + ongoingTransition.get_interval().peek_final_value() === 0) + return; + + const toHide = [this._closeButton]; + + if (!opt.ALWAYS_SHOW_WIN_TITLES) { + toHide.push(this._title); + } + toHide.forEach(a => { + a.opacity = 255; + a.ease({ + opacity: 0, + duration: animate ? WINDOW_OVERLAY_FADE_TIME : 0, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onComplete: () => a.hide(), + }); + }); + + if (this.window_container) { + this.window_container.ease({ + scale_x: 1, + scale_y: 1, + duration: animate ? WINDOW_SCALE_TIME : 0, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } + }, + + _onDestroy() { + // fix for upstream bug - hideOverlay is called after windowPreview is destroyed, from the leave event callback + // but it still throws: + // clutter_actor_get_preferred_width: assertion 'CLUTTER_IS_ACTOR (self)' failed + // clutter_actor_get_preferred_height: assertion 'CLUTTER_IS_ACTOR (self)' failed + this.hideOverlay(false); + + this.metaWindow._delegate = null; + this._delegate = null; + + if (this._longPressLater) { + Meta.later_remove(this._longPressLater); + delete this._longPressLater; + } + + if (this._idleHideOverlayId > 0) { + GLib.source_remove(this._idleHideOverlayId); + this._idleHideOverlayId = 0; + } + + if (this.inDrag) { + this.emit('drag-end'); + this.inDrag = false; + } + + if (this._stateAdjustmentSigId) { + this._workspace.stateAdjustment.disconnect(this._stateAdjustmentSigId); + } + } +} diff --git a/extensions/vertical-workspaces/windowSearchProvider.js b/extensions/vertical-workspaces/windowSearchProvider.js new file mode 100644 index 0000000..3256742 --- /dev/null +++ b/extensions/vertical-workspaces/windowSearchProvider.js @@ -0,0 +1,358 @@ +/** + * Vertical Workspaces + * windowSearchProvider.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 -2023 + * @license GPL-3.0 + */ + +'use strict'; + +const { GLib, GObject, Gio, Gtk, Meta, St, Shell } = imports.gi; + +const Main = imports.ui.main; +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); +const Settings = Me.imports.settings; +const _ = Me.imports.settings._; + +const shellVersion = Settings.shellVersion; + +const ModifierType = imports.gi.Clutter.ModifierType; + +let windowSearchProvider; +let _enableTimeoutId = 0; + +// prefix helps to eliminate results from other search providers +// so it needs to be something less common +// needs to be accessible from vw module +var prefix = 'wq//'; + +let opt; + +const Action = { + NONE: 0, + CLOSE: 1, + CLOSE_ALL: 2, + MOVE_TO_WS: 3, + MOVE_ALL_TO_WS: 4 +} + +function init() { +} + +function getOverviewSearchResult() { + return Main.overview._overview.controls._searchController._searchResults; +} + +function update(reset = false) { + opt = Me.imports.settings.opt; + if (!reset && opt.WINDOW_SEARCH_PROVIDER_ENABLED && !windowSearchProvider) { + enable(); + } else if (reset || !opt.WINDOW_SEARCH_PROVIDER_ENABLED) { + disable(); + opt = null; + } +} + +function enable() { + // delay because Fedora had problem to register a new provider soon after Shell restarts + _enableTimeoutId = GLib.timeout_add( + GLib.PRIORITY_DEFAULT, + 2000, + () => { + if (windowSearchProvider == null) { + windowSearchProvider = new WindowSearchProvider(opt); + getOverviewSearchResult()._registerProvider( + windowSearchProvider + ); + } + _enableTimeoutId = 0; + return GLib.SOURCE_REMOVE; + } + ); +} + +function disable() { + if (windowSearchProvider) { + getOverviewSearchResult()._unregisterProvider( + windowSearchProvider + ); + windowSearchProvider = null; + } + if (_enableTimeoutId) { + GLib.source_remove(_enableTimeoutId); + _enableTimeoutId = 0; + } +} + +function fuzzyMatch(term, text) { + let pos = -1; + const matches = []; + // convert all accented chars to their basic form and to lower case + const _text = text;//.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(); + const _term = term.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(); + + // if term matches the substring exactly, gains the highest weight + if (_text.includes(_term)) { + return 0; + } + + for (let i = 0; i < _term.length; i++) { + let c = _term[i]; + let p; + if (pos > 0) + p = _term[i - 1]; + while (true) { + pos += 1; + if (pos >= _text.length) { + return -1; + } + if (_text[pos] == c) { + matches.push(pos); + break; + } else if (_text[pos] == p) { + matches.pop(); + matches.push(pos); + } + } + } + + // add all position to get a weight of the result + // results closer to the beginning of the text and term characters closer to each other will gain more weight. + return matches.reduce((r, p) => r + p) - matches.length * matches[0] + matches[0]; +} + +function strictMatch(term, text) { + // remove diacritics and accents from letters + let s = text.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(); + let p = term.toLowerCase(); + let ps = p.split(/ +/); + + // allows to use multiple exact patterns separated by a space in arbitrary order + for (let w of ps) { // escape regex control chars + if (!s.match(w.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'))) { + return -1; + } + } + return 0; +} + +function makeResult(window, i) { + const app = Shell.WindowTracker.get_default().get_window_app(window); + const appName = app ? app.get_name() : 'Unknown'; + const windowTitle = window.get_title(); + const wsIndex = window.get_workspace().index(); + + return { + 'id': i, + // convert all accented chars to their basic form and lower case for search + 'name': `${wsIndex + 1}: ${windowTitle} ${appName}`.normalize('NFD').replace(/[\u0300-\u036f]/g, '').toLowerCase(), + 'appName': appName, + 'windowTitle': windowTitle, + 'window': window + } +} + +const closeSelectedRegex = /^\/x!$/; +const closeAllResultsRegex = /^\/xa!$/; +const moveToWsRegex = /^\/m[0-9]+$/; +const moveAllToWsRegex = /^\/ma[0-9]+$/; + +var WindowSearchProvider = class WindowSearchProvider { + constructor(gOptions) { + this._gOptions = gOptions; + this.appInfo = Gio.AppInfo.create_from_commandline('true', 'Open Windows', null); + this.appInfo.get_description = () => 'List of open windows'; + this.appInfo.get_name = () => 'Open Windows'; + this.appInfo.get_id = () => `${Me.metadata.uuid} ${this.title}`; + this.appInfo.get_icon = () => Gio.icon_new_for_string('focus-windows-symbolic'); + this.appInfo.should_show = () => true; + this.title = 'Window Search Provider', + this.canLaunchSearch = true; + this.isRemoteProvider = false; + + this.action = 0; + } + + _getResultSet (terms) { + // do not modify original terms + let termsCopy = [...terms]; + // search for terms without prefix + termsCopy[0] = termsCopy[0].replace(prefix, ''); + + /*if (gOptions.get('searchWindowsCommands')) { + this.action = 0; + this.targetWs = 0; + + const lastTerm = terms[terms.length - 1]; + if (lastTerm.match(closeSelectedRegex)) { + this.action = Action.CLOSE; + } else if (lastTerm.match(closeAllResultsRegex)) { + this.action = Action.CLOSE_ALL; + } else if (lastTerm.match(moveToWsRegex)) { + this.action = Action.MOVE_TO_WS; + } else if (lastTerm.match(moveAllToWsRegex)) { + this.action = Action.MOVE_ALL_TO_WS; + } + if (this.action) { + terms.pop(); + if (this.action === Action.MOVE_TO_WS || this.action === Action.MOVE_ALL_TO_WS) { + this.targetWs = parseInt(lastTerm.replace(/^[^0-9]+/, '')) - 1; + } + } else if (lastTerm.startsWith('/')) { + terms.pop(); + } + }*/ + + const candidates = this.windows; + const _terms = [].concat(termsCopy); + let match; + + const term = _terms.join(' '); + match = (s) => { + return fuzzyMatch(term, s); + } + + const results = []; + let m; + for (let key in candidates) { + if (this._gOptions.get('searchFuzzy')) { + m = fuzzyMatch(term, candidates[key].name); + } else { + m = strictMatch(term, candidates[key].name); + } + if (m !== -1) { + results.push({ weight: m, id: key }); + } + } + + results.sort((a, b) => a.weight > b.weight); + const currentWs = global.workspace_manager.get_active_workspace_index(); + // prefer current workspace + results.sort((a, b) => (this.windows[a.id].window.get_workspace().index() !== currentWs) && (this.windows[b.id].window.get_workspace().index() === currentWs)); + results.sort((a, b) => ((_terms != ' ') && (a.weight > 0 && b.weight === 0))); + + this.resultIds = results.map((item) => item.id); + return this.resultIds; + } + + getResultMetas (resultIds, callback = null) { + const metas = resultIds.map((id) => this.getResultMeta(id)); + if (shellVersion >= 43) { + return new Promise(resolve => resolve(metas)); + } else { + callback(metas); + } + } + + getResultMeta (resultId) { + const result = this.windows[resultId]; + const wsIndex = result.window.get_workspace().index(); + const app = Shell.WindowTracker.get_default().get_window_app(result.window); + return { + 'id': resultId, + 'name': `${wsIndex + 1}: ${result.windowTitle}`, + 'description': result.appName, + 'createIcon': (size) => { + return app + ? app.create_icon_texture(size) + : new St.Icon({ icon_name: 'icon-missing', icon_size: size }); + } + } + } + + launchSearch(terms, timeStamp) { + } + + activateResult (resultId, terms, timeStamp) { + const [,,state] = global.get_pointer(); + + const isCtrlPressed = (state & ModifierType.CONTROL_MASK) != 0; + const isShiftPressed = (state & ModifierType.SHIFT_MASK) != 0; + + this.action = 0; + this.targetWs = 0; + + this.targetWs = global.workspaceManager.get_active_workspace().index() + 1; + if (isShiftPressed && !isCtrlPressed) { + this.action = Action.MOVE_TO_WS; + } else if (isShiftPressed && isCtrlPressed) { + this.action = Action.MOVE_ALL_TO_WS; + } + + if (!this.action) { + const result = this.windows[resultId]; + Main.activateWindow(result.window); + return; + } + + switch (this.action) { + case Action.CLOSE: + this._closeWindows([resultId]); + break; + case Action.CLOSE_ALL: + this._closeWindows(this.resultIds); + break; + case Action.MOVE_TO_WS: + this._moveWindowsToWs(resultId, [resultId]); + break; + case Action.MOVE_ALL_TO_WS: + this._moveWindowsToWs(resultId, this.resultIds); + break; + } + } + + _closeWindows(ids) { + let time = global.get_current_time(); + for (let i = 0; i < ids.length; i++) { + this.windows[ids[i]].window.delete(time + i); + } + Main.notify('Window Search Provider', `Closed ${ids.length} windows.`); + } + + _moveWindowsToWs(selectedId, resultIds) { + const workspace = global.workspaceManager.get_active_workspace(); + + for (let i = 0; i < resultIds.length; i++) { + this.windows[resultIds[i]].window.change_workspace(workspace); + } + const selectedWin = this.windows[selectedId].window; + selectedWin.activate_with_workspace(global.get_current_time(), workspace); + } + + getInitialResultSet (terms, callback, cancellable = null) { + if (shellVersion >=43) { + cancellable = callback; + } + let windows; + this.windows = windows = {}; + global.display.get_tab_list(Meta.TabList.NORMAL, null).filter(w => w.get_workspace() !== null).map( + (v, i) => windows[`${i}-${v.get_id()}`] = makeResult(v, `${i}-${v.get_id()}`) + ); + + + + if (shellVersion >= 43) { + return new Promise(resolve => resolve(this._getResultSet(terms))); + } else { + callback(this._getResultSet(terms)); + } + } + + filterResults (results, maxResults) { + //return results.slice(0, maxResults); + return results; + } + + getSubsearchResultSet (previousResults, terms, callback, cancellable) { + // if we return previous results, quick typers get non-actual results + callback(this._getResultSet(terms)); + } + + createResultOjbect(resultMeta) { + const app = Shell.WindowTracker.get_default().get_window_app(resultMeta.id); + return new AppIcon(app); + } +} diff --git a/extensions/vertical-workspaces/workspace.js b/extensions/vertical-workspaces/workspace.js new file mode 100644 index 0000000..84ca696 --- /dev/null +++ b/extensions/vertical-workspaces/workspace.js @@ -0,0 +1,146 @@ +/** + * Vertical Workspaces + * workspace.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { Clutter, St, Graphene } = imports.gi; + +const Main = imports.ui.main; +const Util = imports.misc.util; +const Workspace = imports.ui.workspace; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); + +const _Util = Me.imports.util; +let _overrides; + +let opt; + +const BACKGROUND_CORNER_RADIUS_PIXELS = 40; + + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + if (reset) { + imports.ui.workspace.WINDOW_PREVIEW_MAXIMUM_SCALE = 0.95; + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + + _overrides = new _Util.Overrides(); + + _overrides.addOverride('WorkspaceBackground', Workspace.WorkspaceBackground.prototype, WorkspaceBackground); + // fix window scaling in workspace state 0 + _overrides.addInjection('WorkspaceLayout', Workspace.WorkspaceLayout.prototype, WorkspaceLayoutInjections); + + // fix overlay base for Vertical Workspaces + _overrides.addOverride('WorkspaceLayout', Workspace.WorkspaceLayout.prototype, WorkspaceLayout); +} + + +// workaround for upstream bug (that is not that invisible in default shell) +// smaller window cannot be scaled below 0.95 (WINDOW_PREVIEW_MAXIMUM_SCALE) +// when its target scale for spread windows view (workspace state 1) is bigger than the scale needed for ws state 0. +// in workspace state 0 where windows are not spread and window scale should follow workspace scale, +// this window follows proper top left corner position, but doesn't scale with the workspace +// so it looks bad and the window can exceed border of the workspace +// extremely annoying in OVERVIEW_MODE 1 with single smaller window on the workspace, also affects appGrid transition animation +var WorkspaceLayoutInjections = { + _init: function() { + this._stateAdjustment.connect('notify::value', () => { + if (opt.OVERVIEW_MODE !== 1) return; + // scale 0.1 for window state 0 just needs to be smaller then possible scale of any window in spread view + const scale = this._stateAdjustment.value ? 0.95 : 0.1; + if (scale !== Workspace.WINDOW_PREVIEW_MAXIMUM_SCALE || this._stateAdjustment.value === 1) { + // when transition to ws state 1 begins, replace the constant with the original one + // disadvantage - the value changes for all workspaces, so one affects others + // that can be visible in certain situations but not a big deal. + Workspace.WINDOW_PREVIEW_MAXIMUM_SCALE = scale; + // and force recalculation of the target layout, so the transition will be smooth + this._needsLayout = true; + } + }); + } +} + +var WorkspaceLayout = { + // this fixes wrong size and position calculation of window clones while moving overview to the next (+1) workspace if vertical ws orientation is enabled in GS + _adjustSpacingAndPadding: function(rowSpacing, colSpacing, containerBox) { + if (this._sortedWindows.length === 0) + return [rowSpacing, colSpacing, containerBox]; + + // All of the overlays have the same chrome sizes, + // so just pick the first one. + const window = this._sortedWindows[0]; + + const [topOversize, bottomOversize] = window.chromeHeights(); + const [leftOversize, rightOversize] = window.chromeWidths(); + + const oversize = Math.max(topOversize, bottomOversize, leftOversize, rightOversize); + + if (rowSpacing !== null) + rowSpacing += oversize; + if (colSpacing !== null) + colSpacing += oversize; + + if (containerBox) { + const vertical = global.workspaceManager.layout_rows === -1; + + const monitor = Main.layoutManager.monitors[this._monitorIndex]; + + const bottomPoint = new Graphene.Point3D(); + if (vertical) { + bottomPoint.x = containerBox.x2; + } else { + bottomPoint.y = containerBox.y2; + } + + const transformedBottomPoint = + this._container.apply_transform_to_point(bottomPoint); + const bottomFreeSpace = vertical + ? (monitor.x + monitor.height) - transformedBottomPoint.x + : (monitor.y + monitor.height) - transformedBottomPoint.y; + + const [, bottomOverlap] = window.overlapHeights(); + + if ((bottomOverlap + oversize) > bottomFreeSpace && !vertical) { + containerBox.y2 -= (bottomOverlap + oversize) - bottomFreeSpace; + } + } + + return [rowSpacing, colSpacing, containerBox]; + } +} + +var WorkspaceBackground = { + _updateBorderRadius: function(value = false) { + // don't round already rounded corners during exposing windows + if (value === false && opt.OVERVIEW_MODE === 1) { + return; + } + const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage); + const cornerRadius = scaleFactor * BACKGROUND_CORNER_RADIUS_PIXELS; + + const backgroundContent = this._bgManager.backgroundActor.content; + value = (value !==false) + ? value + : this._stateAdjustment.value; + + backgroundContent.rounded_clip_radius = + Util.lerp(0, cornerRadius, value); + } +} diff --git a/extensions/vertical-workspaces/workspaceAnimation.js b/extensions/vertical-workspaces/workspaceAnimation.js new file mode 100644 index 0000000..40f61b8 --- /dev/null +++ b/extensions/vertical-workspaces/workspaceAnimation.js @@ -0,0 +1,179 @@ +/** + * Vertical Workspaces + * workspacesAnimation.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { St } = imports.gi; + +const Main = imports.ui.main; +const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup; +const WorkspaceAnimation = imports.ui.workspaceAnimation; +const Me = imports.misc.extensionUtils.getCurrentExtension(); +const _Util = Me.imports.util; + +// touching module properties defined by const/let for the first time returns undefined in GS 42, so we touch it here before we use it +WorkspaceAnimation.MonitorGroup; + +let _origBaseDistance; +let _wsAnimationSwipeBeginId; +let _wsAnimationSwipeEndId; +let _overrides; +let opt; + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + opt = Me.imports.settings.opt; + if (reset || !opt.STATIC_WS_SWITCHER_BG) { + _connectWsAnimationSwipeTracker(true); + _overrideMonitorGroupProperty(true); + _overrides = null; + opt = null; + return; + } + + _overrides = new _Util.Overrides(); + _connectWsAnimationSwipeTracker(); + _overrideMonitorGroupProperty(); + + _overrides.addInjection('WorkspaceAnimationMonitorGroup', WorkspaceAnimation.MonitorGroup.prototype, MonitorGroupInjections); +} + +// remove spacing between workspaces during transition to remove flashing wallpaper between workspaces with maximized windows +function _overrideMonitorGroupProperty(reset = false) { + if (!_origBaseDistance) + _origBaseDistance = Object.getOwnPropertyDescriptor(WorkspaceAnimation.MonitorGroup.prototype,'baseDistance').get; + + let getter; + if (reset) { + if (_origBaseDistance) + getter = { get: _origBaseDistance }; + } else { + getter = { + get: function () { + //const spacing = 100 * St.ThemeContext.get_for_stage(global.stage).scale_factor; + const spacing = 0; + if (global.workspace_manager.layout_rows === -1) + return this._monitor.height + spacing + (opt.PANEL_MODE ? Main.panel.height : 0); // compensation for hidden panel + else + return this._monitor.width + spacing; + } + } + } + + if (getter) + Object.defineProperty(WorkspaceAnimation.MonitorGroup.prototype, "baseDistance", getter); +} + +const MonitorGroupInjections = { + _init: function() { + // we have two options to implement static bg feature + // one is adding background to monitorGroup + // but this one has disadvantage - sticky windows will be always on top of animated windows + // which is bad for conky, for example, that window should be always below + /*this._bgManager = new Background.BackgroundManager({ + container: this, + monitorIndex: this._monitor.index, + controlPosition: false, + });*/ + + // the second option is to make background of the monitorGroup transparent so the real desktop content will stay visible, + // hide windows that should be animated and keep only sticky windows + // we can keep certain sticky windows bellow and also extensions like DING (icons on desktop) will stay visible + this.set_style('background-color: transparent;'); + // stickyGroup holds the Always on Visible Workspace windows to keep them static and above other windows during animation + const stickyGroup = this.get_children()[1]; + stickyGroup._windowRecords.forEach((r, index) => { + const metaWin = r.windowActor.metaWindow; + // conky is sticky but should never get above other windows during ws animation + // so we hide it from the overlay group, we will see the original if not covered by other windows + if (metaWin.wm_class == 'conky') { + r.clone.opacity = 0; + } + }) + this._hiddenWindows = []; + // remove (hide) background wallpaper from the animation, we will see the original one + this._workspaceGroups.forEach(w => w._background.opacity = 0); + // hide (scale to 0) all non-sticky windows, their clones will be animated + global.get_window_actors().forEach(actor => { + const metaWin = actor.metaWindow; + if (metaWin?.get_monitor() === this._monitor.index && !(metaWin?.wm_class == 'conky' && metaWin?.is_on_all_workspaces())) { //* && !w.is_on_all_workspaces()*/) { + // hide original window. we cannot use opacity since it also affects clones. + // scaling them to 0 works well + actor.scale_x = 0; + this._hiddenWindows.push(actor); + } + }); + + // restore all hidden windows at the end of animation + // todo - actors removed during transition need to be removed from the list to avoid access to destroyed actor + this.connect('destroy', () =>{ + this._hiddenWindows.forEach(actor => { + actor.scale_x = 1; + }); + }); + } +} + + +// ------ connect Ws Animation Swipe Tracker -------------- + +function _connectWsAnimationSwipeTracker(reset = false) { + if (reset) { + if (_wsAnimationSwipeBeginId) { + Main.wm._workspaceAnimation._swipeTracker.disconnect(_wsAnimationSwipeBeginId); + _wsAnimationSwipeBeginId = 0; + } + if (_wsAnimationSwipeEndId) { + Main.wm._workspaceAnimation._swipeTracker.disconnect(_wsAnimationSwipeEndId); + _wsAnimationSwipeEndId = 0; + } + } else if (!_wsAnimationSwipeBeginId) { + // display ws switcher popup when gesture begins and connect progress + _wsAnimationSwipeBeginId = Main.wm._workspaceAnimation._swipeTracker.connect('begin', _connectWsAnimationProgress); + // we want to be sure that popup with the final ws index show up when gesture ends + _wsAnimationSwipeEndId = Main.wm._workspaceAnimation._swipeTracker.connect('end', () => _showWsSwitcherPopup(0)); + } +} + +function _connectWsAnimationProgress() { + if (Main.overview.visible) return; + + // progress is being updated only when user finished gesture and the animation continues on "autopilot" + Main.wm._workspaceAnimation._switchData.monitors[0].connect('notify::progress',(actor) => { + const progress = actor.progress % 1; + let direction = 0; + if (!actor._prg) actor._prg = progress; + else if (!progress) return; + else if (progress < actor._prg) direction = -1; + else if (progress > actor._prg) direction = 1; + if (progress < 0.6 && progress > 0.4) + _showWsSwitcherPopup(direction); + }); + + // display popup when gesture begins + _showWsSwitcherPopup(0); +} + +function _showWsSwitcherPopup(direction) { + if (Main.overview.visible) return; + + const wsIndex = global.workspaceManager.get_active_workspace_index() + direction; + if (Main.wm._workspaceSwitcherPopup === null) { + Main.wm._workspaceSwitcherPopup = new WorkspaceSwitcherPopup.WorkspaceSwitcherPopup(); + Main.wm._workspaceSwitcherPopup.connect('destroy', () => { + Main.wm._workspaceSwitcherPopup = null; + }); + } + + Main.wm._workspaceSwitcherPopup.display(wsIndex); +} diff --git a/extensions/vertical-workspaces/workspaceSwitcherPopup.js b/extensions/vertical-workspaces/workspaceSwitcherPopup.js new file mode 100644 index 0000000..5401903 --- /dev/null +++ b/extensions/vertical-workspaces/workspaceSwitcherPopup.js @@ -0,0 +1,55 @@ +/** + * Vertical Workspaces + * workspacesSwitcherPopup.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const Main = imports.ui.main; +const WorkspaceSwitcherPopup = imports.ui.workspaceSwitcherPopup; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); + +const _Util = Me.imports.util; +let _overrides; + +let opt; +var _activateSearchProvider; + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + if (reset) { + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + + _overrides = new _Util.Overrides(); + + if (opt.ORIENTATION) {// 1-VERTICAL, 0-HORIZONTAL + const settings = ExtensionUtils.getSettings('org.gnome.shell'); + const enabled = settings.get_strv('enabled-extensions'); + const allowWsPopupInjection = !(enabled.includes('workspace-switcher-manager@G-dH.github.com') || enabled.includes('WsSwitcherPopupManager@G-dH.github.com-dev')); + if (opt.shellVersion >= 42 && allowWsPopupInjection) + _overrides.addInjection('WorkspaceSwitcherPopup', WorkspaceSwitcherPopup.WorkspaceSwitcherPopup.prototype, WorkspaceSwitcherPopupInjections); + } +} + +const WorkspaceSwitcherPopupInjections = { + _init: function() { + if (this._list) { + this._list.vertical = true; + } + } +} diff --git a/extensions/vertical-workspaces/workspaceThumbnail.js b/extensions/vertical-workspaces/workspaceThumbnail.js new file mode 100644 index 0000000..bbf8900 --- /dev/null +++ b/extensions/vertical-workspaces/workspaceThumbnail.js @@ -0,0 +1,760 @@ +/** + * Vertical Workspaces + * workspaceThumbnail.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { Clutter, Graphene, Meta, Shell, St } = imports.gi; +const DND = imports.ui.dnd; +const Main = imports.ui.main; +const Background = imports.ui.background; +const WorkspaceThumbnail = imports.ui.workspaceThumbnail; +const ThumbnailState = WorkspaceThumbnail.ThumbnailState; + +const ControlsState = imports.ui.overviewControls.ControlsState; + +const ExtensionUtils = imports.misc.extensionUtils; +const Me = ExtensionUtils.getCurrentExtension(); + +const _Util = Me.imports.util; +let _overrides; + +const WORKSPACE_CUT_SIZE = 10; +const original_MAX_THUMBNAIL_SCALE = WorkspaceThumbnail.MAX_THUMBNAIL_SCALE; +let MAX_THUMBNAIL_SCALE; + +var opt = null; + + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + } + + if (reset) { + if (original_MAX_THUMBNAIL_SCALE) + WorkspaceThumbnail.MAX_THUMBNAIL_SCALE = original_MAX_THUMBNAIL_SCALE; + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + + MAX_THUMBNAIL_SCALE = opt.MAX_THUMBNAIL_SCALE; + WorkspaceThumbnail.MAX_THUMBNAIL_SCALE = MAX_THUMBNAIL_SCALE; + + _overrides = new _Util.Overrides(); + + _overrides.addOverride('WorkspaceThumbnail', WorkspaceThumbnail.WorkspaceThumbnail.prototype, WorkspaceThumbnailCommon); + + if (opt.ORIENTATION === Clutter.Orientation.VERTICAL) { + _overrides.addOverride('ThumbnailsBox', WorkspaceThumbnail.ThumbnailsBox.prototype, ThumbnailsBoxVertical); + } else { + _overrides.addOverride('ThumbnailsBox', WorkspaceThumbnail.ThumbnailsBox.prototype, ThumbnailsBoxHorizontal); + } +} + + +var WorkspaceThumbnailCommon = { + after__init: function () { + + //radius of ws thumbnail background + this.add_style_class_name('ws-tmb'); + + // add workspace thumbnails labels if enabled + if (opt.SHOW_WST_LABELS) { // 0 - disable + // layout manager allows aligning widget children + this.layout_manager = new Clutter.BinLayout(); + // adding layout manager to tmb widget breaks wallpaper background aligning and rounded corners + // unless border is removed + if (opt.SHOW_WS_TMB_BG) + this.add_style_class_name('ws-tmb-labeled'); + + const getLabel = function() { + const wsIndex = this.metaWorkspace.index(); + let label = `${wsIndex + 1}`; + if (opt.SHOW_WST_LABELS === 2) { // 2 - index + workspace name + const settings = ExtensionUtils.getSettings('org.gnome.desktop.wm.preferences'); + const wsLabels = settings.get_strv('workspace-names'); + if (wsLabels.length > wsIndex && wsLabels[wsIndex]) { + label += `: ${wsLabels[wsIndex]}`; + } + } else if (opt.SHOW_WST_LABELS === 3) { // 3- index + app name + // global.display.get_tab_list offers workspace filtering using the second argument, but... + // ... it sometimes includes windows from other workspaces, like minimized VBox machines, after Shell restarts + const metaWin = global.display.get_tab_list(0, null).filter( + w => w.get_monitor() === this.monitorIndex && w.get_workspace().index() === wsIndex)[0]; + + if (metaWin) { + let tracker = Shell.WindowTracker.get_default(); + label += `: ${tracker.get_window_app(metaWin).get_name()}`; + } + } else if (opt.SHOW_WST_LABELS === 4) { + const metaWin = global.display.get_tab_list(0, null).filter( + w => w.get_monitor() === this.monitorIndex && w.get_workspace().index() === wsIndex)[0]; + + if (metaWin) { + label += `: ${metaWin.title}`; + } + } + return label; + }.bind(this); + + const label = getLabel(); + + this._wsLabel = new St.Label({ + text: label, + style_class: 'ws-tmb-label', + x_align: Clutter.ActorAlign.FILL, + y_align: Clutter.ActorAlign.END, + x_expand: true, + y_expand: true, + }); + + this._wsLabel._maxOpacity = 255; + this._wsLabel.opacity = this._wsLabel._maxOpacity; + + this.add_child(this._wsLabel); + this.set_child_above_sibling(this._wsLabel, null); + + this._wsIndexSigId = this.metaWorkspace.connect('notify::workspace-index', () => { + const newLabel = getLabel(); + this._wsLabel.text = newLabel; + }); + + this.connect('destroy', () => this.metaWorkspace.disconnect(this._wsIndexSigId)); + + if (opt.SHOW_WST_LABELS_ON_HOVER) { + this._wsLabel.opacity = 0; + this.reactive = true; + this.connect('enter-event', ()=> this._wsLabel.ease({ + duration: 100, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + opacity: this._wsLabel._maxOpacity + })); + this.connect('leave-event', ()=> this._wsLabel.ease({ + duration: 100, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + opacity: 0 + })); + } + } + + if (opt.SHOW_WS_TMB_BG) { + this._bgManager = new Background.BackgroundManager({ + monitorIndex: this.monitorIndex, + container: this._viewport, + vignette: false, + controlPosition: false, + }); + + this._viewport.set_child_below_sibling(this._bgManager.backgroundActor, null); + + this.connect('destroy', function () { + if (this._bgManager) + this._bgManager.destroy(); + this._bgManager = null; + }.bind(this)); + + this._bgManager.backgroundActor.opacity = 220; + + // this all is just for the small border radius... + /*const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage); + const cornerRadius = scaleFactor * BACKGROUND_CORNER_RADIUS_PIXELS; + const backgroundContent = this._bgManager.backgroundActor.content; + backgroundContent.rounded_clip_radius = cornerRadius; + + // the original clip has some addition at the bottom + const rect = new Graphene.Rect(); + rect.origin.x = this._viewport.x; + rect.origin.y = this._viewport.y; + rect.size.width = this._viewport.width; + rect.size.height = this._viewport.height; + + this._bgManager.backgroundActor.content.set_rounded_clip_bounds(rect);*/ + } + }, + + activate: function(time) { + if (this.state > ThumbnailState.NORMAL) + return; + + // if Static Workspace overview mode active, a click on the already active workspace should activate the window picker mode + const wsIndex = this.metaWorkspace.index(); + const lastWsIndex = global.display.get_workspace_manager().get_n_workspaces() - 1; + const stateAdjustment = Main.overview._overview.controls._stateAdjustment; + + if (stateAdjustment.value === ControlsState.APP_GRID) { + if (this.metaWorkspace.active) { + Main.overview._overview.controls._shiftState(Meta.MotionDirection.DOWN); + // if searchActive, hide it immediately + Main.overview.searchEntry.set_text(''); + } else { + this.metaWorkspace.activate(time); + } + } else { + if (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE && wsIndex < lastWsIndex) { + if (stateAdjustment.value > 1) { + stateAdjustment.value = 1; + } + + // spread windows + // in OVERVIEW MODE 2 windows are not spread and workspace is not scaled + // we need to repeat transition to the overview state 1 (window picker), but with spreading windows animation + if (this.metaWorkspace.active) { + opt.WORKSPACE_MODE = 1; + const stateAdjustment = Main.overview._overview.controls._stateAdjustment + // setting value to 0 would reset WORKSPACE_MODE + stateAdjustment.value = 0.01; + stateAdjustment.ease(1, { + duration: 200, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + + /*const adjustment = Main.overview._overview.controls._workspacesDisplay._workspacesViews[0]._workspaces[wsIndex].stateAdjustment; + adjustment.value = 0; + adjustment.ease(1, { + duration: 200, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + });*/ + } else { + // switch ws + this.metaWorkspace.activate(time); + } + // a click on the current workspace should go back to the main view + } else if (this.metaWorkspace.active) { + Main.overview.hide(); + } else { + this.metaWorkspace.activate(time); + } + } + } +} + +// ThumbnailsBox Vertical + +var ThumbnailsBoxVertical = { + _activateThumbnailAtPoint: function(stageX, stageY, time) { + const [r_, x, y] = this.transform_stage_point(stageX, stageY); + + const thumbnail = this._thumbnails.find(t => y >= t.y && y <= t.y + t.height); + if (thumbnail) { + thumbnail.activate(time); + } + }, + + _getPlaceholderTarget: function(index, spacing, rtl) { + const workspace = this._thumbnails[index]; + + let targetY1; + let targetY2; + + if (rtl) { + const baseY = workspace.y + workspace.height; + targetY1 = baseY - WORKSPACE_CUT_SIZE; + targetY2 = baseY + spacing + WORKSPACE_CUT_SIZE; + } else { + targetY1 = workspace.y - spacing - WORKSPACE_CUT_SIZE; + targetY2 = workspace.y + WORKSPACE_CUT_SIZE; + } + + if (index === 0) { + if (rtl) + targetY2 -= spacing + WORKSPACE_CUT_SIZE; + else + targetY1 += spacing + WORKSPACE_CUT_SIZE; + } + + if (index === this._dropPlaceholderPos) { + const placeholderHeight = this._dropPlaceholder.get_height() + spacing; + if (rtl) + targetY2 += placeholderHeight; + else + targetY1 -= placeholderHeight; + } + + return [targetY1, targetY2]; + }, + + _withinWorkspace: function(y, index, rtl) { + const length = this._thumbnails.length; + const workspace = this._thumbnails[index]; + + let workspaceY1 = workspace.y + WORKSPACE_CUT_SIZE; + let workspaceY2 = workspace.y + workspace.height - WORKSPACE_CUT_SIZE; + + if (index === length - 1) { + if (rtl) + workspaceY1 -= WORKSPACE_CUT_SIZE; + else + workspaceY2 += WORKSPACE_CUT_SIZE; + } + + return y > workspaceY1 && y <= workspaceY2; + }, + + handleDragOver: function(source, actor, x, y, time) { + if (!source.metaWindow && + (!source.app || !source.app.can_open_new_window()) && + (source.app || !source.shellWorkspaceLaunch) && + source != Main.xdndHandler) + return DND.DragMotionResult.CONTINUE; + + const rtl = Clutter.get_default_text_direction() === Clutter.TextDirection.RTL; + let canCreateWorkspaces = Meta.prefs_get_dynamic_workspaces(); + let spacing = this.get_theme_node().get_length('spacing'); + + this._dropWorkspace = -1; + let placeholderPos = -1; + let length = this._thumbnails.length; + for (let i = 0; i < length; i++) { + const index = rtl ? length - i - 1 : i; + + if (canCreateWorkspaces && source !== Main.xdndHandler) { + const [targetStart, targetEnd] = + this._getPlaceholderTarget(index, spacing, rtl); + + if (y > targetStart && y <= targetEnd) { + placeholderPos = index; + break; + } + } + + if (this._withinWorkspace(y, index, rtl)) { + this._dropWorkspace = index; + break; + } + } + + if (this._dropPlaceholderPos != placeholderPos) { + this._dropPlaceholderPos = placeholderPos; + this.queue_relayout(); + } + + if (this._dropWorkspace != -1) + return this._thumbnails[this._dropWorkspace].handleDragOverInternal(source, actor, time); + else if (this._dropPlaceholderPos != -1) + return source.metaWindow ? DND.DragMotionResult.MOVE_DROP : DND.DragMotionResult.COPY_DROP; + else + return DND.DragMotionResult.CONTINUE; + }, + + //vfunc_get_preferred_width: function(forHeight) { + // override of this vfunc doesn't work for some reason (tested on Ubuntu and Fedora), it's not reachable + get_preferred_custom_width: function(forHeight) { + if (forHeight === -1) + return this.get_preferred_custom_height(forHeight); + + let themeNode = this.get_theme_node(); + + forHeight = themeNode.adjust_for_width(forHeight); + + let spacing = themeNode.get_length('spacing'); + let nWorkspaces = this._thumbnails.length; + let totalSpacing = (nWorkspaces - 1) * spacing; + + const avail = forHeight - totalSpacing; + + let scale = (avail / nWorkspaces) / this._porthole.height; + scale = Math.min(scale, MAX_THUMBNAIL_SCALE); + + const width = Math.round(this._porthole.width * scale); + + return themeNode.adjust_preferred_width(width, width); + }, + + get_preferred_custom_height: function(_forWidth) { + // Note that for getPreferredHeight/Width we cheat a bit and skip propagating + // the size request to our children because we know how big they are and know + // that the actors aren't depending on the virtual functions being called. + let themeNode = this.get_theme_node(); + + let spacing = themeNode.get_length('spacing'); + let nWorkspaces = this._thumbnails.length; + + let totalSpacing = (nWorkspaces - 1) * spacing; + + const ratio = this._porthole.width / this._porthole.height; + const tmbHeight = _forWidth / ratio; + + const naturalheight = this._thumbnails.reduce((accumulator, thumbnail, index) => { + //let workspaceSpacing = 0; + + const progress = 1 - thumbnail.collapse_fraction; + //const height = (this._porthole.height * MAX_THUMBNAIL_SCALE + workspaceSpacing) * progress; + const height = (tmbHeight) * progress; + return accumulator + height; + }, 0); + + //return themeNode.adjust_preferred_height(totalSpacing, naturalheight); + // we need to calculate the height precisely as it need to align with the workspacesDisplay because of transition animation + // This works perfectly for fullHD monitor, for some reason 5:4 aspect ratio monitor adds unnecessary pixels to the final height of the thumbnailsBox + return [totalSpacing, naturalheight]; + }, + + // removes extra space (extraWidth in the original function), we need the box as accurate as possible + // for precise app grid transition animation + vfunc_allocate: function(box) { + this.set_allocation(box); + + let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL; + + if (this._thumbnails.length == 0) // not visible + return; + + let themeNode = this.get_theme_node(); + box = themeNode.get_content_box(box); + + const portholeWidth = this._porthole.width; + const portholeHeight = this._porthole.height; + const spacing = themeNode.get_length('spacing'); + + const nWorkspaces = this._thumbnails.length; + + // Compute the scale we'll need once everything is updated, + // unless we are currently transitioning + if (this._expandFraction === 1) { + const totalSpacing = (nWorkspaces - 1) * spacing; + const availableHeight = (box.get_height() - totalSpacing) / nWorkspaces; + + const hScale = box.get_width() / portholeWidth; + const vScale = availableHeight / portholeHeight; + const newScale = Math.min(hScale, vScale); + + if (newScale !== this._targetScale) { + if (this._targetScale > 0) { + // We don't ease immediately because we need to observe the + // ordering in queueUpdateStates - if workspaces have been + // removed we need to slide them out as the first thing. + this._targetScale = newScale; + this._pendingScaleUpdate = true; + } else { + this._targetScale = this._scale = newScale; + } + + this._queueUpdateStates(); + } + } + + const ratio = portholeWidth / portholeHeight; + const thumbnailFullHeight = Math.round(portholeHeight * this._scale); + const thumbnailWidth = Math.round(thumbnailFullHeight * ratio); + const thumbnailHeight = thumbnailFullHeight * this._expandFraction; + const roundedVScale = thumbnailHeight / portholeHeight; + + let indicatorValue = this._scrollAdjustment.value; + let indicatorUpperWs = Math.ceil(indicatorValue); + let indicatorLowerWs = Math.floor(indicatorValue); + + let indicatorLowerY1 = 0; + let indicatorLowerY2 = 0; + let indicatorUpperY1 = 0; + let indicatorUpperY2 = 0; + + let indicatorThemeNode = this._indicator.get_theme_node(); + let indicatorTopFullBorder = indicatorThemeNode.get_padding(St.Side.TOP) + indicatorThemeNode.get_border_width(St.Side.TOP); + let indicatorBottomFullBorder = indicatorThemeNode.get_padding(St.Side.BOTTOM) + indicatorThemeNode.get_border_width(St.Side.BOTTOM); + let indicatorLeftFullBorder = indicatorThemeNode.get_padding(St.Side.LEFT) + indicatorThemeNode.get_border_width(St.Side.LEFT); + let indicatorRightFullBorder = indicatorThemeNode.get_padding(St.Side.RIGHT) + indicatorThemeNode.get_border_width(St.Side.RIGHT); + + let y = box.y1; + + if (this._dropPlaceholderPos == -1) { + this._dropPlaceholder.allocate_preferred_size( + ...this._dropPlaceholder.get_position()); + + Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => { + this._dropPlaceholder.hide(); + }); + } + + let childBox = new Clutter.ActorBox(); + + for (let i = 0; i < this._thumbnails.length; i++) { + const thumbnail = this._thumbnails[i]; + if (i > 0) + y += spacing - Math.round(thumbnail.collapse_fraction * spacing); + + const x1 = box.x1; + const x2 = x1 + thumbnailWidth; + + if (i === this._dropPlaceholderPos) { + let [, placeholderHeight] = this._dropPlaceholder.get_preferred_height(-1); + childBox.x1 = x1; + childBox.x2 = x2; + + if (rtl) { + childBox.y2 = box.y2 - Math.round(y); + childBox.y1 = box.y2 - Math.round(y + placeholderHeight); + } else { + childBox.y1 = Math.round(y); + childBox.y2 = Math.round(y + placeholderHeight); + } + + this._dropPlaceholder.allocate(childBox); + + Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => { + this._dropPlaceholder.show(); + }); + y += placeholderHeight + spacing; + } + + // We might end up with thumbnailWidth being something like 99.33 + // pixels. To make this work and not end up with a gap at the end, + // we need some thumbnails to be 99 pixels and some 100 pixels width; + // we compute an actual scale separately for each thumbnail. + const y1 = Math.round(y); + const y2 = Math.round(y + thumbnailHeight); + const roundedHScale = (y2 - y1) / portholeHeight; + + // Allocating a scaled actor is funny - x1/y1 correspond to the origin + // of the actor, but x2/y2 are increased by the *unscaled* size. + if (rtl) { + childBox.y2 = box.y2 - y1; + childBox.y1 = box.y2 - (y1 + thumbnailHeight); + } else { + childBox.y1 = y1; + childBox.y2 = y1 + thumbnailHeight; + } + childBox.x1 = x1; + childBox.x2 = x1 + thumbnailWidth; + + thumbnail.setScale(roundedHScale, roundedVScale); + thumbnail.allocate(childBox); + + if (i === indicatorUpperWs) { + indicatorUpperY1 = childBox.y1; + indicatorUpperY2 = childBox.y2; + } + if (i === indicatorLowerWs) { + indicatorLowerY1 = childBox.y1; + indicatorLowerY2 = childBox.y2; + } + + // We round the collapsing portion so that we don't get thumbnails resizing + // during an animation due to differences in rounded, but leave the uncollapsed + // portion unrounded so that non-animating we end up with the right total + y += thumbnailHeight - Math.round(thumbnailHeight * thumbnail.collapse_fraction); + } + + childBox.x1 = box.x1; + childBox.x2 = box.x1 + thumbnailWidth; + + const indicatorY1 = indicatorLowerY1 + + (indicatorUpperY1 - indicatorLowerY1) * (indicatorValue % 1); + const indicatorY2 = indicatorLowerY2 + + (indicatorUpperY2 - indicatorLowerY2) * (indicatorValue % 1); + + childBox.y1 = indicatorY1 - indicatorTopFullBorder; + childBox.y2 = indicatorY2 + indicatorBottomFullBorder; + childBox.x1 -= indicatorLeftFullBorder; + childBox.x2 += indicatorRightFullBorder; + this._indicator.allocate(childBox); + }, + + _updateShouldShow: function() { + // set current workspace indicator border radius + // here just 'cause it's easier than adding to init + this._indicator.add_style_class_name('ws-tmb'); + + const shouldShow = opt.SHOW_WS_TMB; + if (this._shouldShow === shouldShow) + return; + + this._shouldShow = shouldShow; + this.notify('should-show'); + } +} + +// ThumbnailsBox Horizontal + +var ThumbnailsBoxHorizontal = { + get_preferred_custom_width: function(_forHeight) { + // Note that for getPreferredHeight/Width we cheat a bit and skip propagating + // the size request to our children because we know how big they are and know + // that the actors aren't depending on the virtual functions being called. + let themeNode = this.get_theme_node(); + + let spacing = themeNode.get_length('spacing'); + let nWorkspaces = this._thumbnails.length; + let totalSpacing = (nWorkspaces - 1) * spacing; + + const ratio = this._porthole.height / this._porthole.width; + const tmbWidth = (_forHeight - 2 * spacing) / ratio; + + const naturalWidth = this._thumbnails.reduce((accumulator, thumbnail, index) => { + const progress = 1 - thumbnail.collapse_fraction; + const width = tmbWidth * progress; + return accumulator + width; + }, 0); + + return themeNode.adjust_preferred_width(totalSpacing, naturalWidth); + }, + + vfunc_allocate(box) { + this.set_allocation(box); + + let rtl = Clutter.get_default_text_direction() == Clutter.TextDirection.RTL; + + if (this._thumbnails.length == 0) // not visible + return; + + let themeNode = this.get_theme_node(); + box = themeNode.get_content_box(box); + + const portholeWidth = this._porthole.width; + const portholeHeight = this._porthole.height; + const spacing = themeNode.get_length('spacing'); + + const nWorkspaces = this._thumbnails.length; + + // Compute the scale we'll need once everything is updated, + // unless we are currently transitioning + if (this._expandFraction === 1) { + const totalSpacing = (nWorkspaces - 1) * spacing; + const availableWidth = (box.get_width() - totalSpacing) / nWorkspaces; + + const hScale = availableWidth / portholeWidth; + const vScale = box.get_height() / portholeHeight; + const newScale = Math.min(hScale, vScale); + + if (newScale !== this._targetScale) { + if (this._targetScale > 0) { + // We don't ease immediately because we need to observe the + // ordering in queueUpdateStates - if workspaces have been + // removed we need to slide them out as the first thing. + this._targetScale = newScale; + this._pendingScaleUpdate = true; + } else { + this._targetScale = this._scale = newScale; + } + + this._queueUpdateStates(); + } + } + + const ratio = portholeWidth / portholeHeight; + const thumbnailFullHeight = Math.round(portholeHeight * this._scale); + const thumbnailWidth = Math.round(thumbnailFullHeight * ratio); + const thumbnailHeight = thumbnailFullHeight * this._expandFraction; + const roundedVScale = thumbnailHeight / portholeHeight; + + let indicatorValue = this._scrollAdjustment.value; + let indicatorUpperWs = Math.ceil(indicatorValue); + let indicatorLowerWs = Math.floor(indicatorValue); + + let indicatorLowerX1 = 0; + let indicatorLowerX2 = 0; + let indicatorUpperX1 = 0; + let indicatorUpperX2 = 0; + + let indicatorThemeNode = this._indicator.get_theme_node(); + let indicatorTopFullBorder = indicatorThemeNode.get_padding(St.Side.TOP) + indicatorThemeNode.get_border_width(St.Side.TOP); + let indicatorBottomFullBorder = indicatorThemeNode.get_padding(St.Side.BOTTOM) + indicatorThemeNode.get_border_width(St.Side.BOTTOM); + let indicatorLeftFullBorder = indicatorThemeNode.get_padding(St.Side.LEFT) + indicatorThemeNode.get_border_width(St.Side.LEFT); + let indicatorRightFullBorder = indicatorThemeNode.get_padding(St.Side.RIGHT) + indicatorThemeNode.get_border_width(St.Side.RIGHT); + + let x = box.x1; + + if (this._dropPlaceholderPos == -1) { + this._dropPlaceholder.allocate_preferred_size( + ...this._dropPlaceholder.get_position()); + + Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => { + this._dropPlaceholder.hide(); + }); + } + + let childBox = new Clutter.ActorBox(); + + for (let i = 0; i < this._thumbnails.length; i++) { + const thumbnail = this._thumbnails[i]; + if (i > 0) + x += spacing - Math.round(thumbnail.collapse_fraction * spacing); + + const y1 = box.y1; + const y2 = y1 + thumbnailHeight; + + if (i === this._dropPlaceholderPos) { + const [, placeholderWidth] = this._dropPlaceholder.get_preferred_width(-1); + childBox.y1 = y1; + childBox.y2 = y2; + + if (rtl) { + childBox.x2 = box.x2 - Math.round(x); + childBox.x1 = box.x2 - Math.round(x + placeholderWidth); + } else { + childBox.x1 = Math.round(x); + childBox.x2 = Math.round(x + placeholderWidth); + } + + this._dropPlaceholder.allocate(childBox); + + Meta.later_add(Meta.LaterType.BEFORE_REDRAW, () => { + this._dropPlaceholder.show(); + }); + x += placeholderWidth + spacing; + } + + // We might end up with thumbnailWidth being something like 99.33 + // pixels. To make this work and not end up with a gap at the end, + // we need some thumbnails to be 99 pixels and some 100 pixels width; + // we compute an actual scale separately for each thumbnail. + const x1 = Math.round(x); + const x2 = Math.round(x + thumbnailWidth); + const roundedHScale = (x2 - x1) / portholeWidth; + + // Allocating a scaled actor is funny - x1/y1 correspond to the origin + // of the actor, but x2/y2 are increased by the *unscaled* size. + if (rtl) { + childBox.x2 = box.x2 - x1; + childBox.x1 = box.x2 - (x1 + thumbnailWidth); + } else { + childBox.x1 = x1; + childBox.x2 = x1 + thumbnailWidth; + } + childBox.y1 = y1; + childBox.y2 = y1 + thumbnailHeight; + + thumbnail.setScale(roundedHScale, roundedVScale); + thumbnail.allocate(childBox); + + if (i === indicatorUpperWs) { + indicatorUpperX1 = childBox.x1; + indicatorUpperX2 = childBox.x2; + } + if (i === indicatorLowerWs) { + indicatorLowerX1 = childBox.x1; + indicatorLowerX2 = childBox.x2; + } + + // We round the collapsing portion so that we don't get thumbnails resizing + // during an animation due to differences in rounded, but leave the uncollapsed + // portion unrounded so that non-animating we end up with the right total + x += thumbnailWidth - Math.round(thumbnailWidth * thumbnail.collapse_fraction); + } + + childBox.y1 = box.y1; + childBox.y2 = box.y1 + thumbnailHeight; + + const indicatorX1 = indicatorLowerX1 + + (indicatorUpperX1 - indicatorLowerX1) * (indicatorValue % 1); + const indicatorX2 = indicatorLowerX2 + + (indicatorUpperX2 - indicatorLowerX2) * (indicatorValue % 1); + + childBox.x1 = indicatorX1 - indicatorLeftFullBorder; + childBox.x2 = indicatorX2 + indicatorRightFullBorder; + childBox.y1 -= indicatorTopFullBorder; + childBox.y2 += indicatorBottomFullBorder; + this._indicator.allocate(childBox); + }, + + _updateShouldShow: ThumbnailsBoxVertical._updateShouldShow +} diff --git a/extensions/vertical-workspaces/workspacesView.js b/extensions/vertical-workspaces/workspacesView.js new file mode 100644 index 0000000..820ea6b --- /dev/null +++ b/extensions/vertical-workspaces/workspacesView.js @@ -0,0 +1,864 @@ +/** + * Vertical Workspaces + * workspacesView.js + * + * @author GdH <G-dH@github.com> + * @copyright 2022 - 2023 + * @license GPL-3.0 + * + */ + +'use strict'; + +const { GObject, Clutter, Meta, St } = imports.gi; + +const Main = imports.ui.main; +const Util = imports.misc.util; +const WorkspacesView = imports.ui.workspacesView; +//const SecondaryMonitorDisplay = WorkspacesView.SecondaryMonitorDisplay; +// first call of item defined using const in other module returns undefined +WorkspacesView.SecondaryMonitorDisplay; +const ControlsState = imports.ui.overviewControls.ControlsState; +const FitMode = imports.ui.workspacesView.FitMode; + +const SIDE_CONTROLS_ANIMATION_TIME = imports.ui.overview.ANIMATION_TIME; + +const Me = imports.misc.extensionUtils.getCurrentExtension(); +const SEARCH_WINDOWS_PREFIX = Me.imports.windowSearchProvider.prefix; +const SEARCH_RECENT_FILES_PREFIX = Me.imports.recentFilesSearchProvider.prefix; + +const _Util = Me.imports.util; +let _overrides; + +let opt; + + + +function update(reset = false) { + if (_overrides) { + _overrides.removeAll(); + global.workspace_manager.override_workspace_layout(Meta.DisplayCorner.TOPLEFT, false, 1, -1); + } + + if (reset) { + _overrides = null; + opt = null; + return; + } + + opt = Me.imports.settings.opt; + + _overrides = new _Util.Overrides(); + + _overrides.addOverride('WorkspacesView', WorkspacesView.WorkspacesView.prototype, WorkspacesViewCommon); + _overrides.addOverride('WorkspacesDisplay', WorkspacesView.WorkspacesDisplay.prototype, WorkspacesDisplay); + + if (opt.ORIENTATION) { + // switch internal workspace orientation in GS + global.workspace_manager.override_workspace_layout(Meta.DisplayCorner.TOPLEFT, false, -1, 1); + _overrides.addOverride('SecondaryMonitorDisplay', WorkspacesView.SecondaryMonitorDisplay.prototype, SecondaryMonitorDisplayVertical); + } else { + _overrides.addOverride('SecondaryMonitorDisplay', WorkspacesView.SecondaryMonitorDisplay.prototype, SecondaryMonitorDisplayHorizontal); + } +} + +var WorkspacesViewCommon = { + _getFirstFitSingleWorkspaceBox: function(box, spacing, vertical) { + let [width, height] = box.get_size(); + const [workspace] = this._workspaces; + + const rtl = this.text_direction === Clutter.TextDirection.RTL; + const adj = this._scrollAdjustment; + const currentWorkspace = vertical || !rtl + ? adj.value : adj.upper - adj.value - 1; + + // Single fit mode implies centered too + let [x1, y1] = box.get_origin(); + const [, workspaceWidth] = workspace ? workspace.get_preferred_width(Math.floor(height)) : [,width]; + const [, workspaceHeight] = workspace ? workspace.get_preferred_height(workspaceWidth) : [,height]; + + if (vertical) { + x1 += (width - workspaceWidth) / 2; + y1 -= currentWorkspace * (workspaceHeight + spacing); + } else { + x1 += (width - workspaceWidth) / 2; + x1 -= currentWorkspace * (workspaceWidth + spacing); + } + + const fitSingleBox = new Clutter.ActorBox({x1, y1}); + + fitSingleBox.set_size(workspaceWidth, workspaceHeight); + + return fitSingleBox; + }, + + // set spacing between ws previews + _getSpacing: function(box, fitMode, vertical) { + const [width, height] = box.get_size(); + const [workspace] = this._workspaces; + + if (!workspace) return; + + let availableSpace; + let workspaceSize; + if (vertical) { + [, workspaceSize] = workspace.get_preferred_height(width); + availableSpace = height; + } else { + [, workspaceSize] = workspace.get_preferred_width(height); + availableSpace = width; + } + + const spacing = (availableSpace - workspaceSize * 0.4) * (1 - fitMode); + const { scaleFactor } = St.ThemeContext.get_for_stage(global.stage); + return Math.clamp(spacing, + opt.WORKSPACE_MIN_SPACING * scaleFactor, + opt.WORKSPACE_MAX_SPACING * scaleFactor); + }, + + // this function has duplicate in OverviewControls so we use one function for both to avoid issues with syncing them + _getFitModeForState: function(state) { + return _getFitModeForState(state); + }, + + // normal view 0, spread windows 1 + _getWorkspaceModeForOverviewState: function(state) { + + switch (state) { + case ControlsState.HIDDEN: + return 0; + case ControlsState.WINDOW_PICKER: + return opt.WORKSPACE_MODE; + case ControlsState.APP_GRID: + return ((this._monitorIndex !== global.display.get_primary_monitor() || !opt.WS_ANIMATION) && !opt.OVERVIEW_MODE) ? 1 : 0; + } + + return 0; + }, + + _updateVisibility: function() { + let workspaceManager = global.workspace_manager; + let active = workspaceManager.get_active_workspace_index(); + + const fitMode = this._fitModeAdjustment.value; + const singleFitMode = fitMode === FitMode.SINGLE; + + for (let w = 0; w < this._workspaces.length; w++) { + let workspace = this._workspaces[w]; + + if (this._animating || this._gestureActive || !singleFitMode) { + //workspace.show(); + } else { + workspace.visible = Math.abs(w - active) <= opt.NUMBER_OF_VISIBLE_NEIGHBORS; + } + + } + }, + + // disable scaling and hide inactive workspaces + _updateWorkspacesState: function() { + const adj = this._scrollAdjustment; + const fitMode = this._fitModeAdjustment.value; + + let { initialState, finalState, progress, currentState } = + this._overviewAdjustment.getStateTransitionParams(); + + const workspaceMode = (1 - fitMode) * Util.lerp( + this._getWorkspaceModeForOverviewState(initialState), + this._getWorkspaceModeForOverviewState(finalState), + progress); + + + const currentMonitor = Main.layoutManager.primaryMonitor.index; + + // define the transition values here to save time in each ws + let scaleX, scaleY; + if (opt.ORIENTATION) { //vertical 1 / horizontal 0 + scaleX = 1; + scaleY = 0.1; + } else { + scaleX = 0.1; + scaleY = 1; + } + + const secondaryMonitor = this._monitorIndex !== global.display.get_primary_monitor(); + const blockSecondaryAppGrid = opt.OVERVIEW_MODE && currentState >= 1; + // Hide inactive workspaces + this._workspaces.forEach((w, index) => { + if (!(blockSecondaryAppGrid && secondaryMonitor)) + w.stateAdjustment.value = workspaceMode; + //w.stateAdjustment.value = workspaceMode; + + const distanceToCurrentWorkspace = Math.abs(adj.value - index); + + const scaleProgress = 1 - Math.clamp(distanceToCurrentWorkspace, 0, 1); + + // if we disable workspaces that we can't or don't need to see, transition animations will be noticeably smoother + + // only the current ws needs to be visible during overview transition animations + // and only current and adjacent ws when switching ws + if (opt.WORKSPACE_MAX_SPACING > 340) { // large spacing - only one workspace needs to be visible at once in the overview + w.visible = scaleProgress || ((currentState % 1) && !distanceToCurrentWorkspace); + + // horizontal orientation - 2 adjacent workspaces can be visible on the screen with the current one + // in order to keep animations as smooth as possible, hide all ws that cannot/shouldn't be visible at the given time + } else { + // + w.visible = w.monitorIndex !== currentMonitor || scaleProgress || (!opt.WS_ANIMATION && distanceToCurrentWorkspace < opt.NUMBER_OF_VISIBLE_NEIGHBORS) + || (distanceToCurrentWorkspace < opt.NUMBER_OF_VISIBLE_NEIGHBORS && currentState <= ControlsState.WINDOW_PICKER + && ((initialState < ControlsState.APP_GRID && finalState < ControlsState.APP_GRID)) + ); + + // after transition from APP_GRID to WINDOW_PICKER state, + // adjacent workspaces are hidden and we need them to show up + // make them visible during animation can impact smoothness of the animation + // so we show them after the animation finished, scaling animation will make impression that they move in from outside the monitor + if (!w.visible && distanceToCurrentWorkspace <= opt.NUMBER_OF_VISIBLE_NEIGHBORS && currentState === ControlsState.WINDOW_PICKER) { + w.scale_x = scaleX; + w.scale_y = scaleY; + w.visible = true; + w.ease({ + duration: 100, + scale_x: 1, + scale_y: 1, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + }); + } + } + + // force ws preview bg corner radiuses where GS doesn't do it + if (opt.SHOW_WS_PREVIEW_BG && opt.OVERVIEW_MODE === 1 && distanceToCurrentWorkspace < 2) { + w._background._updateBorderRadius(Math.min(1, w._overviewAdjustment.value)); + } + + // hide workspace background + if (!opt.SHOW_WS_PREVIEW_BG && w._background.opacity) { + w._background.opacity = 0; + } + }); + } +} + +// SecondaryMonitorDisplay Vertical +var SecondaryMonitorDisplayVertical = { + _getThumbnailParamsForState: function(state) { + + let opacity, scale, translation_x; + switch (state) { + case ControlsState.HIDDEN: + opacity = 255; + scale = 1; + translation_x = 0; + if (!Main.layoutManager._startingUp && (!opt.SHOW_WS_PREVIEW_BG || opt.OVERVIEW_MODE2)) { + translation_x = this._thumbnails.width * (opt.SEC_WS_TMB_LEFT ? -1 : 1); + } + break; + case ControlsState.WINDOW_PICKER: + case ControlsState.APP_GRID: + opacity = 255; + scale = 1; + translation_x = 0; + break; + default: + opacity = 255; + scale = 1; + translation_x = 0; + break; + } + + return { opacity, scale, translation_x }; + }, + + _getThumbnailsWidth: function(box, spacing) { + if (!this._thumbnails.visible) + return 0; + + const [width, height] = box.get_size(); + const { expandFraction } = this._thumbnails; + const [, thumbnailsWidth] = this._thumbnails.get_preferred_custom_width(height - 2 * spacing); + return Math.min( + thumbnailsWidth * expandFraction, + width * opt.MAX_THUMBNAIL_SCALE); + }, + + _getWorkspacesBoxForState: function(state, box, padding, thumbnailsWidth, spacing) { + //const { ControlsState } = OverviewControls; + const workspaceBox = box.copy(); + const [width, height] = workspaceBox.get_size(); + + switch (state) { + case ControlsState.HIDDEN: + break; + case ControlsState.WINDOW_PICKER: + case ControlsState.APP_GRID: + if (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE) { + break; + } + + let wWidth = Math.round(width - thumbnailsWidth - 5 * spacing); + let wHeight = Math.round(Math.min(wWidth / (width / height), height - 1.7 * padding)); + wWidth *= opt.WS_PREVIEW_SCALE; + wHeight *= opt.WS_PREVIEW_SCALE; + + let wsbX; + let offset = Math.round(width - thumbnailsWidth - wWidth) / 2; + if (opt.SEC_WS_TMB_LEFT) { + wsbX = thumbnailsWidth + offset; + } else { + wsbX = offset; + } + + const wsbY = Math.round((height - wHeight) / 2); + + workspaceBox.set_origin(wsbX, wsbY); + workspaceBox.set_size(wWidth, wHeight); + break; + } + + return workspaceBox; + }, + + vfunc_allocate: function(box) { + this.set_allocation(box); + + const themeNode = this.get_theme_node(); + const contentBox = themeNode.get_content_box(box); + const [width, height] = contentBox.get_size(); + const { expandFraction } = this._thumbnails; + const spacing = themeNode.get_length('spacing') * expandFraction; + const padding = Math.round(0.1 * height); + + let thumbnailsWidth = this._getThumbnailsWidth(contentBox, spacing); + let [, thumbnailsHeight] = this._thumbnails.get_preferred_custom_height(thumbnailsWidth); + thumbnailsHeight = Math.min(thumbnailsHeight, height - 2 * spacing); + + this._thumbnails.visible = opt.SHOW_WS_TMB; + if (this._thumbnails.visible) { + let wsTmbX; + if (opt.SEC_WS_TMB_LEFT) { // left + wsTmbX = Math.round(spacing / 4); + this._thumbnails._positionLeft = true; + } else { + wsTmbX = Math.round(width - spacing / 4 - thumbnailsWidth); + this._thumbnails._positionLeft = false; + } + + const childBox = new Clutter.ActorBox(); + const availSpace = height - thumbnailsHeight - 2 * spacing; + + let wsTmbY = availSpace / 2; + wsTmbY -= opt.SEC_WS_TMB_POSITION_ADJUSTMENT * wsTmbY - spacing; + + childBox.set_origin(Math.round(wsTmbX), Math.round(wsTmbY)); + childBox.set_size(thumbnailsWidth, thumbnailsHeight); + this._thumbnails.allocate(childBox); + } + + const { + currentState, initialState, finalState, transitioning, progress, + } = this._overviewAdjustment.getStateTransitionParams(); + + let workspacesBox; + const workspaceParams = [contentBox, padding, thumbnailsWidth, spacing]; + if (!transitioning) { + workspacesBox = + this._getWorkspacesBoxForState(currentState, ...workspaceParams); + } else { + const initialBox = + this._getWorkspacesBoxForState(initialState, ...workspaceParams); + const finalBox = + this._getWorkspacesBoxForState(finalState, ...workspaceParams); + workspacesBox = initialBox.interpolate(finalBox, progress); + } + this._workspacesView.allocate(workspacesBox); + }, + + _updateThumbnailVisibility: function() { + if (opt.OVERVIEW_MODE2) { + this.set_child_above_sibling(this._thumbnails, null); + } + + const visible = !(this._settings.get_boolean('workspaces-only-on-primary') || + opt.SEC_WS_TMB_POSITION === 3); // 3 - disabled + + if (this._thumbnails.visible === visible) + return; + + this._thumbnails.show(); + this._updateThumbnailParams(); + this._thumbnails.ease_property('expand-fraction', visible ? 1 : 0, { + duration: SIDE_CONTROLS_ANIMATION_TIME, + mode: Clutter.AnimationMode.EASE_OUT_QUAD, + onComplete: () => { + this._thumbnails.visible = visible; + this._thumbnails._indicator.visible = visible; + }, + }); + }, + + _updateThumbnailParams: function() { + // workaround for upstream bug - secondary thumbnails boxes don't catch 'showing' signal on the shell startup and don't populate the box with thumbnails + // the tmbBox contents is also destroyed when overview state adjustment gets above 1 when swiping gesture from window picker to app grid + if (!this._thumbnails._thumbnails.length) { + this._thumbnails._createThumbnails(); + } + + if (!this._thumbnails.visible) + return; + + const { initialState, finalState, progress } = + this._overviewAdjustment.getStateTransitionParams(); + + const initialParams = this._getThumbnailParamsForState(initialState); + const finalParams = this._getThumbnailParamsForState(finalState); + + /*const opacity = + Util.lerp(initialParams.opacity, finalParams.opacity, progress); + const scale = + Util.lerp(initialParams.scale, finalParams.scale, progress);*/ + + // OVERVIEW_MODE 2 should animate dash and wsTmbBox only if WORKSPACE_MODE === 0 (windows not spread) + const animateOverviewMode2 = opt.OVERVIEW_MODE2 && !(finalState === 1 && opt.WORKSPACE_MODE); + const translation_x = (!Main.layoutManager._startingUp && ((!opt.SHOW_WS_PREVIEW_BG && !(opt.OVERVIEW_MODE2)) || animateOverviewMode2)) + ? Util.lerp(initialParams.translation_x, finalParams.translation_x, progress) + : 0; + + this._thumbnails.set({ + opacity: 255, + //scale_x: scale, + //scale_y: scale, + translation_x, + }); + }, + + _updateWorkspacesView: function() { + if (this._workspacesView) + this._workspacesView.destroy(); + + if (this._settings.get_boolean('workspaces-only-on-primary')) { + this._workspacesView = new WorkspacesView.ExtraWorkspaceView( + this._monitorIndex, + this._overviewAdjustment); + } else { + this._workspacesView = new WorkspacesView.WorkspacesView( + this._monitorIndex, + this._controls, + this._scrollAdjustment, + // Secondary monitors don't need FitMode.ALL since there is workspace switcher always visible + //this._fitModeAdjustment, + new St.Adjustment({ + actor: this, + value: 0,//FitMode.SINGLE, + lower: 0,//FitMode.SINGLE, + upper: 0,//FitMode.SINGLE, + }), + //secondaryOverviewAdjustment); + this._overviewAdjustment); + } + this.add_child(this._workspacesView); + this._thumbnails.opacity = 0; + } +} + +// SecondaryMonitorDisplay Horizontal +var SecondaryMonitorDisplayHorizontal = { + _getThumbnailParamsForState: function(state) { + //const { ControlsState } = OverviewControls; + + let opacity, scale, translation_y; + switch (state) { + case ControlsState.HIDDEN: + opacity = 255; + scale = 1; + translation_y = 0; + if (!Main.layoutManager._startingUp && (!opt.SHOW_WS_PREVIEW_BG || opt.OVERVIEW_MODE2)) { + translation_y = this._thumbnails.height * (opt.SEC_WS_TMB_TOP ? -1 : 1); + } + break; + case ControlsState.WINDOW_PICKER: + case ControlsState.APP_GRID: + opacity = 255; + scale = 1; + translation_y = 0; + break; + default: + opacity = 255; + scale = 1; + translation_y = 0; + break; + } + + return { opacity, scale, translation_y }; + }, + + _getWorkspacesBoxForState: function(state, box, padding, thumbnailsHeight, spacing) { + //const { ControlsState } = OverviewControls; + const workspaceBox = box.copy(); + const [width, height] = workspaceBox.get_size(); + + switch (state) { + case ControlsState.HIDDEN: + break; + case ControlsState.WINDOW_PICKER: + case ControlsState.APP_GRID: + if (opt.OVERVIEW_MODE2 && !opt.WORKSPACE_MODE) { + break; + } + + let wHeight = Math.round(Math.min(height - thumbnailsHeight - 5 * spacing)); + let wWidth = Math.round(Math.min(wHeight * (width / height), width - 1.7 * padding)); + wWidth *= opt.WS_PREVIEW_SCALE; + wHeight *= opt.WS_PREVIEW_SCALE; + + let wsbY; + let offset = Math.round((height - thumbnailsHeight - wHeight) / 2); + if (opt.WS_TMB_TOP) { + wsbY = thumbnailsHeight + offset; + } else { + wsbY = offset; + } + + const wsbX = Math.round((width - wWidth) / 2); + + workspaceBox.set_origin(wsbX, wsbY); + workspaceBox.set_size(wWidth, wHeight); + break; + } + + return workspaceBox; + }, + + _getThumbnailsHeight: function(box) { + if (!this._thumbnails.visible) + return 0; + + const [width, height] = box.get_size(); + const { expandFraction } = this._thumbnails; + const [thumbnailsHeight] = this._thumbnails.get_preferred_height(width); + return Math.min( + thumbnailsHeight * expandFraction, + height * opt.MAX_THUMBNAIL_SCALE); + }, + + vfunc_allocate: function(box) { + this.set_allocation(box); + + const themeNode = this.get_theme_node(); + const contentBox = themeNode.get_content_box(box); + const [width, height] = contentBox.get_size(); + const { expandFraction } = this._thumbnails; + const spacing = themeNode.get_length('spacing') * expandFraction; + const padding = Math.round(0.1 * height); + + let thumbnailsHeight = this._getThumbnailsHeight(contentBox); + let [, thumbnailsWidth] = this._thumbnails.get_preferred_custom_width(thumbnailsHeight); + thumbnailsWidth = Math.min(thumbnailsWidth, width - 2 * spacing); + + this._thumbnails.visible = opt.SHOW_WS_TMB; + if (this._thumbnails.visible) { + let wsTmbY; + if (opt.SEC_WS_TMB_TOP) { + wsTmbY = Math.round(spacing / 4); + } else { + wsTmbY = Math.round(height - spacing / 4 - thumbnailsHeight); + } + + const childBox = new Clutter.ActorBox(); + const availSpace = width - thumbnailsWidth - 2 * spacing; + + let wsTmbX = availSpace / 2; + wsTmbX -= opt.SEC_WS_TMB_POSITION_ADJUSTMENT * wsTmbX - spacing; + + childBox.set_origin(Math.round(wsTmbX), Math.round(wsTmbY)); + childBox.set_size(thumbnailsWidth, thumbnailsHeight); + this._thumbnails.allocate(childBox); + } + + const { + currentState, initialState, finalState, transitioning, progress, + } = this._overviewAdjustment.getStateTransitionParams(); + + let workspacesBox; + const workspaceParams = [contentBox, padding, thumbnailsHeight, spacing]; + if (!transitioning) { + workspacesBox = + this._getWorkspacesBoxForState(currentState, ...workspaceParams); + } else { + const initialBox = + this._getWorkspacesBoxForState(initialState, ...workspaceParams); + const finalBox = + this._getWorkspacesBoxForState(finalState, ...workspaceParams); + workspacesBox = initialBox.interpolate(finalBox, progress); + } + this._workspacesView.allocate(workspacesBox); + }, + + _updateThumbnailVisibility: SecondaryMonitorDisplayVertical._updateThumbnailVisibility, + + _updateThumbnailParams: function() { + // workaround for upstream bug - secondary thumbnails boxes don't catch 'showing' signal on the shell startup and don't populate the box with thumbnails + // the tmbBox contents is also destroyed when overview state adjustment gets above 1 when swiping gesture from window picker to app grid + if (!this._thumbnails._thumbnails.length) { + this._thumbnails._createThumbnails(); + } + + if (!this._thumbnails.visible) + return; + + const { initialState, finalState, progress } = + this._overviewAdjustment.getStateTransitionParams(); + + const initialParams = this._getThumbnailParamsForState(initialState); + const finalParams = this._getThumbnailParamsForState(finalState); + + /*const opacity = + Util.lerp(initialParams.opacity, finalParams.opacity, progress); + const scale = + Util.lerp(initialParams.scale, finalParams.scale, progress);*/ + + // OVERVIEW_MODE 2 should animate dash and wsTmbBox only if WORKSPACE_MODE === 0 (windows not spread) + const animateOverviewMode2 = opt.OVERVIEW_MODE2 && !(finalState === 1 && opt.WORKSPACE_MODE); + const translation_y = (!Main.layoutManager._startingUp && ((!opt.SHOW_WS_PREVIEW_BG && !(opt.OVERVIEW_MODE2)) || animateOverviewMode2)) + ? Util.lerp(initialParams.translation_y, finalParams.translation_y, progress) + : 0; + + this._thumbnails.set({ + opacity: 255, + //scale_x: scale, + //scale_y: scale, + translation_y, + }); + }, + + _updateWorkspacesView: function() { + if (this._workspacesView) + this._workspacesView.destroy(); + + if (this._settings.get_boolean('workspaces-only-on-primary')) { + this._workspacesView = new WorkspacesView.ExtraWorkspaceView( + this._monitorIndex, + this._overviewAdjustment); + } else { + this._workspacesView = new WorkspacesView.WorkspacesView( + this._monitorIndex, + this._controls, + this._scrollAdjustment, + // Secondary monitors don't need FitMode.ALL since there is workspace switcher always visible + //this._fitModeAdjustment, + new St.Adjustment({ + actor: this, + value: 0,//FitMode.SINGLE, + lower: 0,//FitMode.SINGLE, + upper: 0,//FitMode.SINGLE, + }), + //secondaryOverviewAdjustment); + this._overviewAdjustment); + } + this.add_child(this._workspacesView); + this._thumbnails.opacity = 0; + } +} + +var WorkspacesDisplay = { + _updateWorkspacesViews: function() { + for (let i = 0; i < this._workspacesViews.length; i++) + this._workspacesViews[i].destroy(); + + this._primaryIndex = Main.layoutManager.primaryIndex; + this._workspacesViews = []; + let monitors = Main.layoutManager.monitors; + for (let i = 0; i < monitors.length; i++) { + let view; + if (i === this._primaryIndex) { + view = new WorkspacesView.WorkspacesView(i, + this._controls, + this._scrollAdjustment, + this._fitModeAdjustment, + this._overviewAdjustment); + + view.visible = this._primaryVisible; + this.bind_property('opacity', view, 'opacity', GObject.BindingFlags.SYNC_CREATE); + this.add_child(view); + } else { + view = new WorkspacesView.SecondaryMonitorDisplay(i, + this._controls, + this._scrollAdjustment, + // Secondary monitors don't need FitMode.ALL since there is workspace switcher always visible + //this._fitModeAdjustment, + new St.Adjustment({ + actor: this, + value: 0,//FitMode.SINGLE, + lower: 0,//FitMode.SINGLE, + upper: 0,//FitMode.SINGLE, + }), + this._overviewAdjustment); + Main.layoutManager.overviewGroup.add_actor(view); + } + + this._workspacesViews.push(view); + } + }, + + _onScrollEvent: function(actor, event) { + if (this._swipeTracker.canHandleScrollEvent(event)) + return Clutter.EVENT_PROPAGATE; + + if (!this.mapped) + return Clutter.EVENT_PROPAGATE; + + if (this._workspacesOnlyOnPrimary && + this._getMonitorIndexForEvent(event) != this._primaryIndex) + return Clutter.EVENT_PROPAGATE; + + const isShiftPressed = (event.get_state() & Clutter.ModifierType.SHIFT_MASK) != 0; + /*const isCtrlPressed = (event.get_state() & Clutter.ModifierType.CONTROL_MASK) != 0; + const isAltPressed = (event.get_state() & Clutter.ModifierType.MOD1_MASK) != 0; + const noModifiersPressed = !(isCtrlPressed && isShiftPressed && isAltPressed); + + if (OVERVIEW_MODE2 && noModifiersPressed) { + Main.overview.hide(); + return Clutter.EVENT_STOP; + }*/ + + let direction = event.get_scroll_direction(); + + if (/*SHIFT_REORDERS_WS && */isShiftPressed) { + if (direction === Clutter.ScrollDirection.UP) { + direction = -1; + } + else if (direction === Clutter.ScrollDirection.DOWN) { + direction = 1; + } else { + direction = 0; + } + + if (direction) { + _reorderWorkspace(direction); + // make all workspaces on primary monitor visible for case the new position is hidden + Main.overview._overview._controls._workspacesDisplay._workspacesViews[0]._workspaces.forEach(w => w.visible = true); + return Clutter.EVENT_STOP; + } + } + + return Main.wm.handleWorkspaceScroll(event); + }, + + _onKeyPressEvent: function(actor, event) { + const symbol = event.get_key_symbol(); + /*const { ControlsState } = OverviewControls; + if (this._overviewAdjustment.value !== ControlsState.WINDOW_PICKER && symbol !== Clutter.KEY_space) + return Clutter.EVENT_PROPAGATE;*/ + + /*if (!this.reactive) + return Clutter.EVENT_PROPAGATE;**/ + const isCtrlPressed = (event.get_state() & Clutter.ModifierType.CONTROL_MASK) != 0; + const isShiftPressed = (event.get_state() & Clutter.ModifierType.SHIFT_MASK) != 0; + const isAltPressed = (event.get_state() & Clutter.ModifierType.MOD1_MASK) != 0; + const { workspaceManager } = global; + const vertical = workspaceManager.layout_rows === -1; + const rtl = this.get_text_direction() === Clutter.TextDirection.RTL; + + let which; + switch (symbol) { + /*case Clutter.KEY_Return:*/ + case Clutter.KEY_Page_Up: + if (vertical) + which = Meta.MotionDirection.UP; + else if (rtl) + which = Meta.MotionDirection.RIGHT; + else + which = Meta.MotionDirection.LEFT; + break; + case Clutter.KEY_Page_Down: + if (vertical) + which = Meta.MotionDirection.DOWN; + else if (rtl) + which = Meta.MotionDirection.LEFT; + else + which = Meta.MotionDirection.RIGHT; + break; + case Clutter.KEY_Home: + which = 0; + break; + case Clutter.KEY_End: + which = workspaceManager.n_workspaces - 1; + break; + case Clutter.KEY_space: + if (isCtrlPressed && isShiftPressed) { + _Util.openPreferences(); + } else if (isAltPressed) { + Main.ctrlAltTabManager._items.forEach(i => {if (i.sortGroup === 1 && i.name === 'Dash') Main.ctrlAltTabManager.focusGroup(i)}); + } else if (opt.RECENT_FILES_SEARCH_PROVIDER_ENABLED && isCtrlPressed) { + _Util.activateSearchProvider(SEARCH_RECENT_FILES_PREFIX); + } else if (opt.WINDOW_SEARCH_PROVIDER_ENABLED/* && SEARCH_WINDOWS_SPACE*/) { + _Util.activateSearchProvider(SEARCH_WINDOWS_PREFIX); + } + return Clutter.EVENT_STOP; + case Clutter.KEY_Down: + case Clutter.KEY_Left: + case Clutter.KEY_Right: + case Clutter.KEY_Up: + if (Main.overview._overview._controls._searchController.searchActive) { + Main.overview.searchEntry.grab_key_focus(); + } else /*if (OVERVIEW_MODE && !WORKSPACE_MODE)*/ { + Main.ctrlAltTabManager._items.forEach(i => {if (i.sortGroup === 1 && i.name === 'Dash') Main.ctrlAltTabManager.focusGroup(i)}); + } + return Clutter.EVENT_STOP; + default: + return Clutter.EVENT_PROPAGATE; + } + + let ws; + if (which < 0) + // Negative workspace numbers are directions + ws = workspaceManager.get_active_workspace().get_neighbor(which); + else + // Otherwise it is a workspace index + ws = workspaceManager.get_workspace_by_index(which); + + if (/*SHIFT_REORDERS_WS && */isShiftPressed) { + let direction; + if (which === Meta.MotionDirection.UP || which === Meta.MotionDirection.LEFT) + direction = -1; + else if (which === Meta.MotionDirection.DOWN || which === Meta.MotionDirection.RIGHT) + direction = 1; + if (direction) + _reorderWorkspace(direction); + // make all workspaces on primary monitor visible for case the new position is hidden + Main.overview._overview._controls._workspacesDisplay._workspacesViews[0]._workspaces.forEach(w => w.visible = true); + return Clutter.EVENT_STOP; + } + + if (ws) + Main.wm.actionMoveWorkspace(ws); + + return Clutter.EVENT_STOP; + }, +} + +// same copy of this function should be available in OverviewControls and WorkspacesView +function _getFitModeForState(state) { + switch (state) { + case ControlsState.HIDDEN: + case ControlsState.WINDOW_PICKER: + return FitMode.SINGLE; + case ControlsState.APP_GRID: + if (opt.WS_ANIMATION && opt.SHOW_WS_TMB) + return FitMode.ALL; + else + return FitMode.SINGLE; + default: + return FitMode.SINGLE; + } +} + +// ------------------ Reorder Workspaces - callback for Dash and workspacesDisplay ----------------------------------- + +function _reorderWorkspace(direction = 0) { + let activeWs = global.workspace_manager.get_active_workspace(); + let activeWsIdx = activeWs.index(); + let targetIdx = activeWsIdx + direction; + if (targetIdx > -1 && targetIdx < (global.workspace_manager.get_n_workspaces())) { + global.workspace_manager.reorder_workspace(activeWs, targetIdx); + } +} |
