Skip to content

Add keybind for maximizing tiled views #2689

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions metadata/simple-tile.xml
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,15 @@
<_long>Moves focus to the window below with the specified key.</_long>
<default>&lt;super&gt; KEY_J</default>
</option>
<option name="key_toggle_maximized" type="key">
<_short>Key toggle maximized</_short>
<_long>
Toggles the maximized state of the currently focused tiled view.
When enabled, the view fills the workarea (like fullscreen, but stays in its tile).
When disabled, the view returns to its previous tiled size.
</_long>
<default>&lt;super&gt; KEY_M</default>
</option>
<option name="inner_gap_size" type="int">
<_short>Inner gap size</_short>
<_long>Number of pixels to shrink of a view when it has a neighbor in a given direction.</_long>
Expand Down
12 changes: 12 additions & 0 deletions plugins/tile/tile-plugin.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ class tile_output_plugin_t : public wf::pointer_interaction_t, public wf::custom
wf::option_wrapper_t<wf::buttonbinding_t> button_resize{"simple-tile/button_resize"};

wf::option_wrapper_t<wf::keybinding_t> key_toggle_tile{"simple-tile/key_toggle"};
wf::option_wrapper_t<wf::keybinding_t> key_toggle_maximized{"simple-tile/key_toggle_maximized"};
wf::option_wrapper_t<wf::keybinding_t> key_focus_left{"simple-tile/key_focus_left"};
wf::option_wrapper_t<wf::keybinding_t> key_focus_right{"simple-tile/key_focus_right"};
wf::option_wrapper_t<wf::keybinding_t> key_focus_above{"simple-tile/key_focus_above"};
Expand Down Expand Up @@ -271,6 +272,16 @@ class tile_output_plugin_t : public wf::pointer_interaction_t, public wf::custom
});
};

wf::key_callback on_toggle_maximized = [=] (auto)
{
auto view = wf::get_core().seat->get_active_view();
auto node = tile::view_node_t::get_node(view);
node->show_maximized = !node->show_maximized;
autocommit_transaction_t tx;
node->set_geometry(node->geometry, tx.tx);
return true;
};

bool focus_adjacent(tile::split_insertion_t direction)
{
return conditioned_view_execute(true, [=] (wayfire_toplevel_view view)
Expand Down Expand Up @@ -348,6 +359,7 @@ class tile_output_plugin_t : public wf::pointer_interaction_t, public wf::custom
output->add_button(button_move, &on_move_view);
output->add_button(button_resize, &on_resize_view);
output->add_key(key_toggle_tile, &on_toggle_tiled_state);
output->add_key(key_toggle_maximized, &on_toggle_maximized);

output->add_key(key_focus_left, &on_focus_adjacent);
output->add_key(key_focus_right, &on_focus_adjacent);
Expand Down
21 changes: 19 additions & 2 deletions plugins/tile/tree.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#include <wayfire/output.hpp>
#include <wayfire/workspace-set.hpp>
#include <wayfire/workarea.hpp>
#include <wayfire/view-transform.hpp>
#include <wayfire/plugins/crossfade.hpp>
#include <wayfire/plugins/common/util.hpp>
Expand Down Expand Up @@ -399,6 +400,14 @@ wf::geometry_t view_node_t::calculate_target_geometry()
size.height,
};
}
else if (this->show_maximized)
{
local_geometry = wset->get_attached_output()->workarea->get_workarea();
local_geometry.x += gaps.left;
local_geometry.y += gaps.top;
local_geometry.width -= gaps.left + gaps.right;
local_geometry.height -= gaps.top + gaps.bottom;
}

if (view->sticky)
{
Expand Down Expand Up @@ -458,10 +467,18 @@ void view_node_t::set_geometry(wf::geometry_t geometry, wf::txn::transaction_upt
}

wf::get_core().default_wm->update_last_windowed_geometry(view);
view->toplevel()->pending().tiled_edges = TILED_EDGES_ALL;
tx->add_object(view->toplevel());

auto target = calculate_target_geometry();

bool is_fullscreen = view->pending_fullscreen();
bool is_maximized = this->show_maximized;

if (is_fullscreen || is_maximized)
{
view->toplevel()->pending().tiled_edges = TILED_EDGES_ALL;
tx->add_object(view->toplevel());
}

if (this->needs_crossfade() && (target != view->get_geometry()))
{
view->get_transformed_node()->rem_transformer(scale_transformer_name);
Expand Down
6 changes: 6 additions & 0 deletions plugins/tile/tree.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ struct view_node_t : public tree_node_t
~view_node_t();

wayfire_toplevel_view view;

/**
* Set the geometry of the node and the contained view.
*
Expand All @@ -168,6 +169,11 @@ struct view_node_t : public tree_node_t
*/
void set_geometry(wf::geometry_t geometry, wf::txn::transaction_uptr& tx) override;

/**
* When true, the view will occupy the entire workarea (minus gaps),
*/
bool show_maximized = false;

/**
* Set the gaps for non-fullscreen mode.
* The gap sizes will be subtracted from all edges of the view's geometry.
Expand Down
Loading