switch (self->state)
{
- case WINDOW_UP:
- /* Pull Down */
- tomboy_window_present_hardcore (GTK_WINDOW(self->window));
- self->state = WINDOW_DOWN;
-
- // Focusing the term here works perfectly, near as I can tell
+ case WINDOW_UP: /* Pull the window up */
+
+ /* Bugfix: having this here keeps the tilda window from being
+ * hidden if you turn off "stick", pull it down on workspace 1,
+ * switch to workspace 2, then pull it up and back down. Without
+ * this, something in metacity (at least) hides the window. Stupid. */
+ gtk_window_deiconify (GTK_WINDOW(self->window));
+
+ /* Re-set the window properties that do not linger after hiding the
+ * window. I know this looks stupid, but it keeps all of the state-
+ * changing code in the place it belongs: the property-setting code. */
+ g_object_set (G_OBJECT(self),
+ "keep-above", self->keep_above,
+ "stick", self->stick,
+ NULL);
+ gtk_window_present_with_time (GTK_WINDOW(self->window),
+ tomboy_keybinder_get_current_event_time());
+
+ /* Focusing the term here works perfectly, near as I can tell */
tt = tilda_window_find_current_terminal (self);
gtk_widget_grab_focus (GTK_WIDGET(tt->vte_term));
+
+ self->state = WINDOW_DOWN;
break;
- case WINDOW_DOWN:
- /* Pull Up */
+ case WINDOW_DOWN: /* Pull the window up */
+
gtk_widget_hide (GTK_WIDGET(self->window));
+
self->state = WINDOW_UP;
break;
TILDA_WINDOW_KEY,
- TILDA_WINDOW_MIN_HEIGHT,
- TILDA_WINDOW_MIN_WIDTH,
- TILDA_WINDOW_MAX_HEIGHT,
- TILDA_WINDOW_MAX_WIDTH,
+ TILDA_WINDOW_HEIGHT,
+ TILDA_WINDOW_WIDTH,
TILDA_WINDOW_X_POSITION,
TILDA_WINDOW_Y_POSITION,
TILDA_WINDOW_ANIMATION_DELAY,
TILDA_WINDOW_KEEP_ABOVE,
- TILDA_WINDOW_SHOW_IN_TASKBAR,
- TILDA_WINDOW_PINNED,
+ TILDA_WINDOW_SKIP_TASKBAR_HINT,
+ TILDA_WINDOW_STICK,
TILDA_WINDOW_HIDDEN_AT_START,
TILDA_WINDOW_CENTERED_HORIZONTALLY,
TILDA_WINDOW_CENTERED_VERTICALLY,
g_print ("window key: %s\n", self->key);
break;
- case TILDA_WINDOW_MIN_HEIGHT:
- self->min_height = g_value_get_int (value);
- g_print ("window min height: %d\n", self->min_height);
- break;
-
- case TILDA_WINDOW_MIN_WIDTH:
- self->min_width = g_value_get_int (value);
- g_print ("window min width: %d\n", self->min_width);
+ case TILDA_WINDOW_HEIGHT:
+ self->height = g_value_get_int (value);
+ gtk_widget_set_size_request (self->window, self->width, self->height);
+ gtk_window_resize (GTK_WINDOW(self->window), self->width, self->height);
+ g_print ("window height: %d\n", self->height);
break;
- case TILDA_WINDOW_MAX_HEIGHT:
- self->max_height = g_value_get_int (value);
- g_print ("window max height: %d\n", self->max_height);
- break;
-
- case TILDA_WINDOW_MAX_WIDTH:
- self->max_width = g_value_get_int (value);
- g_print ("window max width: %d\n", self->max_width);
+ case TILDA_WINDOW_WIDTH:
+ self->width = g_value_get_int (value);
+ gtk_widget_set_size_request (self->window, self->width, self->height);
+ gtk_window_resize (GTK_WINDOW(self->window), self->width, self->height);
+ g_print ("window width: %d\n", self->width);
break;
case TILDA_WINDOW_X_POSITION:
case TILDA_WINDOW_TAB_POSITION:
self->tab_position = g_value_get_int (value);
+ gtk_notebook_set_tab_pos (GTK_NOTEBOOK(self->notebook), self->tab_position);
g_print ("window tab position: %d\n", self->tab_position);
break;
case TILDA_WINDOW_KEEP_ABOVE:
self->keep_above = g_value_get_boolean (value);
+ gtk_window_set_keep_above (GTK_WINDOW(self->window), self->keep_above);
g_print ("window keep above: %d\n", self->keep_above);
break;
- case TILDA_WINDOW_SHOW_IN_TASKBAR:
- self->show_in_taskbar = g_value_get_boolean (value);
- g_print ("window show in taskbar: %d\n", self->show_in_taskbar);
+ case TILDA_WINDOW_SKIP_TASKBAR_HINT:
+ self->skip_taskbar_hint = g_value_get_boolean (value);
+ gtk_window_set_skip_taskbar_hint (GTK_WINDOW(self->window), self->skip_taskbar_hint);
+ g_print ("window skip taskbar hint: %d\n", self->skip_taskbar_hint);
break;
- case TILDA_WINDOW_PINNED:
- self->pinned = g_value_get_boolean (value);
- g_print ("window pinned: %d\n", self->pinned);
+ case TILDA_WINDOW_STICK:
+ self->stick = g_value_get_boolean (value);
+
+ /* This is moderately ugly, but GTK+ does it this way... */
+ self->stick ? gtk_window_stick (GTK_WINDOW(self->window))
+ : gtk_window_unstick (GTK_WINDOW(self->window));
+ g_print ("window stick: %d\n", self->stick);
break;
case TILDA_WINDOW_HIDDEN_AT_START:
g_value_set_string (value, self->key);
break;
- case TILDA_WINDOW_MIN_HEIGHT:
- g_value_set_int (value, self->min_height);
- break;
-
- case TILDA_WINDOW_MIN_WIDTH:
- g_value_set_int (value, self->min_width);
+ case TILDA_WINDOW_HEIGHT:
+ g_value_set_int (value, self->height);
break;
- case TILDA_WINDOW_MAX_HEIGHT:
- g_value_set_int (value, self->max_height);
- break;
-
- case TILDA_WINDOW_MAX_WIDTH:
- g_value_set_int (value, self->max_width);
+ case TILDA_WINDOW_WIDTH:
+ g_value_set_int (value, self->width);
break;
case TILDA_WINDOW_X_POSITION:
g_value_set_boolean (value, self->keep_above);
break;
- case TILDA_WINDOW_SHOW_IN_TASKBAR:
- g_value_set_boolean (value, self->show_in_taskbar);
+ case TILDA_WINDOW_SKIP_TASKBAR_HINT:
+ g_value_set_boolean (value, self->skip_taskbar_hint);
break;
- case TILDA_WINDOW_PINNED:
- g_value_set_boolean (value, self->pinned);
+ case TILDA_WINDOW_STICK:
+ g_value_set_boolean (value, self->stick);
break;
case TILDA_WINDOW_HIDDEN_AT_START:
// FIXME: Remove these, and replace with reads from the config system
g_object_set (G_OBJECT(self), "key", "F2", NULL);
g_object_set (G_OBJECT(self), "x-position", 0, "y-position", 0, NULL);
+ g_object_set (G_OBJECT(self), "height", 400, "width", 1680, NULL);
gtk_window_set_decorated (GTK_WINDOW(self->window), FALSE);
TILDA_WINDOW_KEY,
pspec);
- pspec = g_param_spec_int ("min-height",
- "Window's minimum height",
- NULL,
- 0,
- INT_MAX,
- 0,
- G_PARAM_READWRITE);
-
- g_object_class_install_property (gobject_class,
- TILDA_WINDOW_MIN_HEIGHT,
- pspec);
-
- pspec = g_param_spec_int ("min-width",
- "Window's minimum width",
- NULL,
- 0,
- INT_MAX,
- 0,
- G_PARAM_READWRITE);
-
- g_object_class_install_property (gobject_class,
- TILDA_WINDOW_MIN_WIDTH,
- pspec);
-
- pspec = g_param_spec_int ("max-height",
- "Window's maximum height",
+ pspec = g_param_spec_int ("height",
+ "Window's height",
NULL,
0,
INT_MAX,
G_PARAM_READWRITE);
g_object_class_install_property (gobject_class,
- TILDA_WINDOW_MAX_HEIGHT,
+ TILDA_WINDOW_HEIGHT,
pspec);
- pspec = g_param_spec_int ("max-width",
- "Window's maximum width",
+ pspec = g_param_spec_int ("width",
+ "Window's width",
NULL,
0,
INT_MAX,
G_PARAM_READWRITE);
g_object_class_install_property (gobject_class,
- TILDA_WINDOW_MAX_WIDTH,
+ TILDA_WINDOW_WIDTH,
pspec);
pspec = g_param_spec_int ("x-position",
TILDA_WINDOW_KEEP_ABOVE,
pspec);
- pspec = g_param_spec_boolean ("show-in-taskbar",
- "Show this window in the taskbar",
+ pspec = g_param_spec_boolean ("skip-taskbar-hint",
+ "Hide this window in the taskbar if TRUE",
NULL,
FALSE,
G_PARAM_READWRITE);
g_object_class_install_property (gobject_class,
- TILDA_WINDOW_SHOW_IN_TASKBAR,
+ TILDA_WINDOW_SKIP_TASKBAR_HINT,
pspec);
- pspec = g_param_spec_boolean ("pinned",
+ pspec = g_param_spec_boolean ("stick",
"Display this window on all workspaces",
NULL,
FALSE,
G_PARAM_READWRITE);
g_object_class_install_property (gobject_class,
- TILDA_WINDOW_PINNED,
+ TILDA_WINDOW_STICK,
pspec);
pspec = g_param_spec_boolean ("hidden-at-start",
projects / tilda-gobject.git / blobdiff