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

Revert "Implement zoom" #741

Closed
wants to merge 1 commit into from
Closed

Revert "Implement zoom" #741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 0 additions & 27 deletions compositor/WindowManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,6 @@ namespace GreeterCompositor {
//ActivatableComponent? workspace_view = null;
//ActivatableComponent? window_overview = null;

private Zoom zoom;

//ScreenSaver? screensaver;

//Gee.LinkedList<ModalProxy> modal_stack = new Gee.LinkedList<ModalProxy> ();
Expand Down Expand Up @@ -137,7 +135,6 @@ namespace GreeterCompositor {

ui_group = new Clutter.Actor ();
ui_group.reactive = true;
update_ui_group_size ();
stage.add_child (ui_group);

int width, height;
Expand All @@ -164,9 +161,6 @@ namespace GreeterCompositor {
pointer_locator = new PointerLocator (this);
ui_group.add_child (pointer_locator);

unowned var monitor_manager = display.get_context ().get_backend ().get_monitor_manager ();
monitor_manager.monitors_changed.connect (update_ui_group_size);

/*keybindings*/

KeyBinding.set_custom_handler ("switch-to-workspace-first", () => {});
Expand Down Expand Up @@ -194,8 +188,6 @@ namespace GreeterCompositor {

KeyBinding.set_custom_handler ("show-desktop", () => {});

zoom = new Zoom (this);

/* orca (screenreader) doesn't listen to it's
org.gnome.desktop.a11y.applications screen-reader-enabled key
so we handle it ourselves
Expand All @@ -216,25 +208,6 @@ namespace GreeterCompositor {
});
}

private void update_ui_group_size () {
unowned var display = get_display ();

int max_width = 0;
int max_height = 0;

var num_monitors = display.get_n_monitors ();
for (int i = 0; i < num_monitors; i++) {
var geom = display.get_monitor_geometry (i);
var total_width = geom.x + geom.width;
var total_height = geom.y + geom.height;

max_width = (max_width > total_width) ? max_width : total_width;
max_height = (max_height > total_height) ? max_height : total_height;
}

ui_group.set_size (max_width, max_height);
}

private async void start_command (string[] command) {
if (Meta.Util.is_wayland_compositor ()) {
yield start_wayland (command);
Expand Down
141 changes: 0 additions & 141 deletions compositor/Zoom.vala
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions compositor/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ compositor_files = files(
'MediaFeedback.vala',
'PointerLocator.vala',
'Utils.vala',
'WindowManager.vala',
'Zoom.vala'
'WindowManager.vala'
)

executable(
Expand Down
14 changes: 0 additions & 14 deletions data/compositor.gschema.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions data/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@ conf_data = configuration_data()
conf_data.set('GETTEXT_PACKAGE', meson.project_name())
conf_data.set('PROJECT_NAME', meson.project_name())

install_data(
'compositor.gschema.xml',
install_dir: join_paths(get_option('prefix'), get_option('datadir'), 'glib-2.0', 'schemas'),
rename: 'io.elementary.greeter-compositor.gschema.xml'
)

desktop_in = configure_file (
input: meson.project_name() + '.desktop.in.in',
output: meson.project_name() + '.desktop.in',
Expand Down
2 changes: 0 additions & 2 deletions meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,3 @@ vapigen = find_program('vapigen', required: false)
if vapigen.found()
subdir('vapi')
endif

gnome.post_install(glib_compile_schemas: true)