Skip to content
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.

Sign up for GitHub

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

Jump to bottom

WorkspaceInsertThumb: Support floating point scale factors #1629

Merged
merged 5 commits into from Apr 7, 2023
Merged

WorkspaceInsertThumb: Support floating point scale factors #1629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d9a3f9e
WorkspaceInsertThumb: Support floating point scale factors
davidmhewitt Apr 7, 2023
c3cbba5
Fix width
davidmhewitt Apr 7, 2023
bababf7
Support reallocation
davidmhewitt Apr 7, 2023
06faaba
Reallocate on construct
davidmhewitt Apr 7, 2023
3887dac
Remove old scale factor getter
davidmhewitt Apr 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
37 changes: 28 additions & 9 deletions src/Widgets/IconGroupContainer.vala
View file
Open in desktop
Expand Up @@ -27,20 +27,40 @@ namespace Gala {

public signal void request_reposition (bool animate);

public Meta.Display display { get; construct; }
private float _scale_factor = 1.0f;
public float scale_factor {
get {
return _scale_factor;
}
set {
if (value != _scale_factor) {
_scale_factor = value;
reallocate ();
}
}
}

public IconGroupContainer (Meta.Display display) {
Object (display: display);
public IconGroupContainer (float scale) {
Object (scale_factor: scale);

layout_manager = new Clutter.BoxLayout ();
}

private void reallocate () {
foreach (var child in get_children ()) {
unowned WorkspaceInsertThumb thumb = child as WorkspaceInsertThumb;
if (thumb != null) {
thumb.scale_factor = scale_factor;
}
}
}

public void add_group (IconGroup group) {
var index = group.workspace.index ();

insert_child_at_index (group, index * 2);

var thumb = new WorkspaceInsertThumb (index);
var thumb = new WorkspaceInsertThumb (index, scale_factor);
thumb.notify["expanded"].connect_after (expanded_changed);
insert_child_at_index (thumb, index * 2);

Expand All @@ -63,8 +83,8 @@ namespace Gala {
* it and it's previous WorkspaceInsertThumb. This would make
* the container immediately reallocate and fill the empty space
* with right-most IconGroups.
*
* We don't want that until the IconGroup
*
* We don't want that until the IconGroup
* leaves the expanded WorkspaceInsertThumb.
*/
public void remove_group_in_place (IconGroup group) {
Expand Down Expand Up @@ -107,9 +127,8 @@ namespace Gala {
* end states into account
*/
public float calculate_total_width () {
var scale = InternalUtils.get_ui_scaling_factor ();
var spacing = SPACING * scale;
var group_width = GROUP_WIDTH * scale;
var spacing = InternalUtils.scale_to_int (SPACING, scale_factor);
var group_width = InternalUtils.scale_to_int (GROUP_WIDTH, scale_factor);

var width = 0.0f;
foreach (var child in get_children ()) {
Expand Down
4 changes: 3 additions & 1 deletion src/Widgets/MultitaskingView.vala
View file
Open in desktop
Expand Up @@ -71,7 +71,7 @@ namespace Gala {
workspaces = new Clutter.Actor ();
workspaces.set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);

icon_groups = new IconGroupContainer (display);
icon_groups = new IconGroupContainer (display.get_monitor_scale (display.get_primary_monitor ()));

dock_clones = new Clutter.Actor ();

Expand Down Expand Up @@ -157,6 +157,8 @@ namespace Gala {
}

var primary_geometry = display.get_monitor_geometry (primary);
var scale = display.get_monitor_scale (primary);
icon_groups.scale_factor = scale;

set_position (primary_geometry.x, primary_geometry.y);
set_size (primary_geometry.width, primary_geometry.height);
Expand Down
35 changes: 24 additions & 11 deletions src/Widgets/WorkspaceInsertThumb.vala
View file
Open in desktop
Expand Up @@ -10,16 +10,25 @@ public class Gala.WorkspaceInsertThumb : Clutter.Actor {
public int workspace_index { get; construct set; }
public bool expanded { get; set; default = false; }
public int delay { get; set; default = EXPAND_DELAY; }
private float _scale_factor = 1.0f;
public float scale_factor {
get {
return _scale_factor;
}
set {
if (value != _scale_factor) {
_scale_factor = value;
reallocate ();
}
}
}

private uint expand_timeout = 0;

public WorkspaceInsertThumb (int workspace_index) {
Object (workspace_index: workspace_index);
public WorkspaceInsertThumb (int workspace_index, float scale) {
Object (workspace_index: workspace_index, scale_factor: scale);

var scale = InternalUtils.get_ui_scaling_factor ();
width = IconGroupContainer.SPACING * scale;
height = IconGroupContainer.GROUP_WIDTH * scale;
y = (IconGroupContainer.GROUP_WIDTH * scale - IconGroupContainer.SPACING * scale) / 2;
reallocate ();
opacity = 0;
set_pivot_point (0.5f, 0.5f);
reactive = true;
Expand All @@ -46,11 +55,16 @@ public class Gala.WorkspaceInsertThumb : Clutter.Actor {
add_action (drop);
}

private void reallocate () {
width = InternalUtils.scale_to_int (IconGroupContainer.SPACING, scale_factor);
height = InternalUtils.scale_to_int (IconGroupContainer.GROUP_WIDTH, scale_factor);
y = InternalUtils.scale_to_int (IconGroupContainer.GROUP_WIDTH - IconGroupContainer.SPACING, scale_factor) / 2;
}

public void set_window_thumb (Meta.Window window) {
destroy_all_children ();

var scale = InternalUtils.get_ui_scaling_factor ();
var icon = new WindowIcon (window, IconGroupContainer.GROUP_WIDTH, scale) {
var icon = new WindowIcon (window, IconGroupContainer.GROUP_WIDTH, (int)Math.round (scale_factor)) {
x = IconGroupContainer.SPACING,
x_align = Clutter.ActorAlign.CENTER
};
Expand All @@ -70,16 +84,15 @@ public class Gala.WorkspaceInsertThumb : Clutter.Actor {
set_easing_mode (Clutter.AnimationMode.EASE_OUT_QUAD);
set_easing_duration (200);

var scale = InternalUtils.get_ui_scaling_factor ();
if (!expand) {
remove_transition ("pulse");
opacity = 0;
width = IconGroupContainer.SPACING * scale;
width = InternalUtils.scale_to_int (IconGroupContainer.SPACING, scale_factor);
expanded = false;
} else {
add_pulse_animation ();
opacity = 200;
width = IconGroupContainer.GROUP_WIDTH * scale + IconGroupContainer.SPACING * 2;
width = InternalUtils.scale_to_int (IconGroupContainer.GROUP_WIDTH + IconGroupContainer.SPACING * 2, scale_factor);
expanded = true;
}

Expand Down