Remove e_shell_adapt_window_size().
Its preconditions are never TRUE, and is therefore a no-op function.
This commit is contained in:
@ -2261,7 +2261,6 @@ comp_editor_init (CompEditor *editor)
|
||||
|
||||
gtk_application_add_window (
|
||||
GTK_APPLICATION (shell), GTK_WINDOW (editor));
|
||||
e_shell_adapt_window_size (shell, GTK_WINDOW (editor));
|
||||
}
|
||||
|
||||
static gboolean
|
||||
|
||||
@ -1970,8 +1970,6 @@ msg_composer_constructed (GObject *object)
|
||||
object, "delete-event",
|
||||
G_CALLBACK (msg_composer_delete_event_cb), NULL);
|
||||
|
||||
e_shell_adapt_window_size (shell, GTK_WINDOW (object));
|
||||
|
||||
gtk_application_add_window (
|
||||
GTK_APPLICATION (shell), GTK_WINDOW (object));
|
||||
|
||||
|
||||
@ -27,7 +27,6 @@ e_shell_event
|
||||
EShellQuitReason
|
||||
e_shell_quit
|
||||
e_shell_cancel_quit
|
||||
e_shell_adapt_window_size
|
||||
e_shell_set_startup_view
|
||||
e_shell_get_startup_view
|
||||
e_shell_migrate_attempt
|
||||
|
||||
@ -725,20 +725,6 @@ shell_window_create_shell_view (EShellWindow *shell_window,
|
||||
return shell_view;
|
||||
}
|
||||
|
||||
static void
|
||||
shell_window_realize (GtkWidget *widget)
|
||||
{
|
||||
EShellWindow *shell_window;
|
||||
|
||||
shell_window = E_SHELL_WINDOW (widget);
|
||||
e_shell_adapt_window_size (
|
||||
shell_window->priv->shell,
|
||||
GTK_WINDOW (widget));
|
||||
|
||||
/* Chain up to parent's dispose() method. */
|
||||
GTK_WIDGET_CLASS (e_shell_window_parent_class)->realize (widget);
|
||||
}
|
||||
|
||||
static void
|
||||
shell_window_submit_alert (EAlertSink *alert_sink,
|
||||
EAlert *alert)
|
||||
@ -771,7 +757,6 @@ static void
|
||||
e_shell_window_class_init (EShellWindowClass *class)
|
||||
{
|
||||
GObjectClass *object_class;
|
||||
GtkWidgetClass *widget_class;
|
||||
|
||||
g_type_class_add_private (class, sizeof (EShellWindowPrivate));
|
||||
|
||||
@ -782,9 +767,6 @@ e_shell_window_class_init (EShellWindowClass *class)
|
||||
object_class->finalize = shell_window_finalize;
|
||||
object_class->constructed = shell_window_constructed;
|
||||
|
||||
widget_class = GTK_WIDGET_CLASS (class);
|
||||
widget_class->realize = shell_window_realize;
|
||||
|
||||
class->construct_menubar = shell_window_construct_menubar;
|
||||
class->construct_toolbar = shell_window_construct_toolbar;
|
||||
class->construct_sidebar = shell_window_construct_sidebar;
|
||||
|
||||
@ -1836,40 +1836,6 @@ e_shell_cancel_quit (EShell *shell)
|
||||
g_signal_stop_emission (shell, signals[QUIT_REQUESTED], 0);
|
||||
}
|
||||
|
||||
/**
|
||||
* e_shell_adapt_window_size:
|
||||
* @shell: an #EShell
|
||||
* @window: a #GtkWindow to adapt to full-screen
|
||||
*
|
||||
* This is used to adapt to window's size to be optimal for
|
||||
* the platform. The shell settings are used to determine if
|
||||
* a window should be set to full screen etc.
|
||||
*
|
||||
* This method is best called when the widget is realized on
|
||||
* a given screen.
|
||||
**/
|
||||
void
|
||||
e_shell_adapt_window_size (EShell *shell,
|
||||
GtkWindow *window)
|
||||
{
|
||||
GdkScreen *screen;
|
||||
GdkRectangle rect;
|
||||
GdkWindow *gdk_window;
|
||||
gint monitor;
|
||||
|
||||
if (!e_shell_get_meego_mode (shell) || TRUE)
|
||||
return;
|
||||
|
||||
screen = gdk_screen_get_default ();
|
||||
gdk_window = gtk_widget_get_window (GTK_WIDGET (window));
|
||||
monitor = gdk_screen_get_monitor_at_window (screen, gdk_window);
|
||||
gdk_screen_get_monitor_geometry (screen, monitor, &rect);
|
||||
|
||||
gtk_window_set_default_size (window, rect.width, rect.height);
|
||||
gtk_window_set_decorated (window, FALSE);
|
||||
gtk_window_maximize (window);
|
||||
}
|
||||
|
||||
void
|
||||
e_shell_set_startup_view (EShell *shell,
|
||||
const gchar *view)
|
||||
|
||||
@ -144,8 +144,6 @@ gboolean e_shell_quit (EShell *shell,
|
||||
EShellQuitReason reason);
|
||||
void e_shell_cancel_quit (EShell *shell);
|
||||
|
||||
void e_shell_adapt_window_size (EShell *shell,
|
||||
GtkWindow *window);
|
||||
void e_shell_set_startup_view (EShell *shell,
|
||||
const gchar *view);
|
||||
const gchar * e_shell_get_startup_view (EShell *shell);
|
||||
|
||||
Reference in New Issue
Block a user