Don't remember the window position but the size only.
It is often useful to have multiple browser windows opening at once, and having them open on top of each other is counterproductive. Most window managers, on the other hand, have code to decide where to place a window so that it is accessible by the user.
This commit is contained in:
parent
3f4c2e3c14
commit
e3561c71ad
3 changed files with 5 additions and 24 deletions
|
@ -823,14 +823,6 @@ void on_findbox_button_close_clicked(GtkWidget* widget, CBrowser* browser)
|
|||
gtk_widget_hide(browser->findbox);
|
||||
}
|
||||
|
||||
static gboolean on_window_configure(GtkWidget* widget, GdkEventConfigure* event
|
||||
, CBrowser* browser)
|
||||
{
|
||||
gtk_window_get_position(GTK_WINDOW(browser->window)
|
||||
, &config->winLeft, &config->winTop);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
static void on_window_size_allocate(GtkWidget* widget, GtkAllocation* allocation
|
||||
, CBrowser* browser)
|
||||
{
|
||||
|
@ -882,24 +874,19 @@ CBrowser* browser_new(CBrowser* oldBrowser)
|
|||
GdkScreen* screen = gtk_window_get_screen(GTK_WINDOW(browser->window));
|
||||
const gint defaultWidth = (gint)gdk_screen_get_width(screen) / 1.7;
|
||||
const gint defaultHeight = (gint)gdk_screen_get_height(screen) / 1.7;
|
||||
if(config->rememberWinMetrics)
|
||||
if(config->rememberWinSize)
|
||||
{
|
||||
if(!config->winWidth && !config->winHeight)
|
||||
{
|
||||
config->winWidth = defaultWidth;
|
||||
config->winHeight = defaultWidth;
|
||||
}
|
||||
if(config->winLeft && config->winTop)
|
||||
gtk_window_move(GTK_WINDOW(browser->window)
|
||||
, config->winLeft, config->winTop);
|
||||
gtk_window_set_default_size(GTK_WINDOW(browser->window)
|
||||
, config->winWidth, config->winHeight);
|
||||
}
|
||||
else
|
||||
gtk_window_set_default_size(GTK_WINDOW(browser->window)
|
||||
, defaultWidth, defaultHeight);
|
||||
g_signal_connect(browser->window, "configure-event"
|
||||
, G_CALLBACK(on_window_configure), browser);
|
||||
g_signal_connect(browser->window, "size-allocate"
|
||||
, G_CALLBACK(on_window_size_allocate), browser);
|
||||
// FIXME: Use custom program icon
|
||||
|
|
10
src/conf.c
10
src/conf.c
|
@ -87,10 +87,8 @@ gboolean config_from_file(CConfig* config, const gchar* filename, GError** error
|
|||
#define GET_STR(var, key, default) \
|
||||
var = sokoke_key_file_get_string_default( \
|
||||
keyFile, "session", key, default, NULL)
|
||||
GET_INT(config->rememberWinMetrics , "RememberWinMetrics", TRUE);
|
||||
GET_INT(config->winLeft , "WinLeft", 0);
|
||||
GET_INT(config->winTop , "WinTop", 0);
|
||||
GET_INT(config->winWidth , "WinWidth", 0);
|
||||
GET_INT(config->rememberWinSize, "RememberWinSize", TRUE);
|
||||
GET_INT(config->winWidth, "WinWidth", 0);
|
||||
GET_INT(config->winHeight, "WinHeight", 0);
|
||||
GET_INT(config->winPanelPos, "WinPanelPos", 0);
|
||||
GET_INT(config->searchEngine, "SearchEngine", 0);
|
||||
|
@ -149,9 +147,7 @@ gboolean config_to_file(CConfig* config, const gchar* filename, GError** error)
|
|||
g_key_file_set_integer(keyFile, "content", "EnableJavaScript", config->enableJavaScript);
|
||||
g_key_file_set_integer(keyFile, "content", "EnablePlugins", config->enablePlugins);
|
||||
|
||||
g_key_file_set_integer(keyFile, "session", "RememberWinMetrics", config->rememberWinMetrics);
|
||||
g_key_file_set_integer(keyFile, "session", "WinLeft", config->winLeft);
|
||||
g_key_file_set_integer(keyFile, "session", "WinTop", config->winTop);
|
||||
g_key_file_set_integer(keyFile, "session", "RememberWinSize", config->rememberWinSize);
|
||||
g_key_file_set_integer(keyFile, "session", "WinWidth", config->winWidth);
|
||||
g_key_file_set_integer(keyFile, "session", "WinHeight", config->winHeight);
|
||||
g_key_file_set_integer(keyFile, "session", "WinPanelPos", config->winPanelPos);
|
||||
|
|
|
@ -43,9 +43,7 @@ typedef struct _CConfig
|
|||
gboolean enableJavaScript;
|
||||
gboolean enablePlugins;
|
||||
|
||||
gboolean rememberWinMetrics; // Restore last state upon startup?
|
||||
gint winLeft;
|
||||
gint winTop;
|
||||
gboolean rememberWinSize; // Restore window size upon startup?
|
||||
gint winWidth;
|
||||
gint winHeight;
|
||||
guint winPanelPos;
|
||||
|
|
Loading…
Reference in a new issue