diff options
author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-11-21 10:20:19 +0000 |
---|---|---|
committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-11-21 10:20:19 +0000 |
commit | de47e5e4a58acf41d5506b90950d6dc9518b4ff8 (patch) | |
tree | b807b44e51e928e6dfe3ef823f6f083c42b78dee | |
parent | 8c010a245f24fb83baf02ed397b2ea742eaae21c (diff) |
win32: fixed compose window appeared always top-left.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@768 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ChangeLog.ja | 5 | ||||
-rw-r--r-- | src/compose.c | 25 |
3 files changed, 22 insertions, 13 deletions
@@ -1,5 +1,10 @@ 2005-11-21 + * src/compose.c: compose_create(): win32: fixed window appeared always + top-left. + +2005-11-21 + * src/compose.c: compose_get_signature_str() compose_insert_file(): give priority to locale to UTF-8 conversion diff --git a/ChangeLog.ja b/ChangeLog.ja index bfdc7ff5..e548a3bc 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,5 +1,10 @@ 2005-11-21 + * src/compose.c: compose_create(): win32: ウィンドウが常に左上に + 出現していたのを修正。 + +2005-11-21 + * src/compose.c: compose_get_signature_str() compose_insert_file(): ロケール→UTF-8 変換を優先するようにした diff --git a/src/compose.c b/src/compose.c index 5983fc14..8a12ae3a 100644 --- a/src/compose.c +++ b/src/compose.c @@ -4020,9 +4020,9 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode) compose->account = account; window = gtk_window_new(GTK_WINDOW_TOPLEVEL); + gtk_window_set_wmclass(GTK_WINDOW(window), "compose", "Sylpheed"); gtk_window_set_policy(GTK_WINDOW(window), TRUE, TRUE, FALSE); gtk_widget_set_size_request(window, -1, prefs_common.compose_height); - gtk_window_set_wmclass(GTK_WINDOW(window), "compose", "Sylpheed"); if (!geometry.max_width) { geometry.max_width = gdk_screen_width(); @@ -4034,7 +4034,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode) g_signal_connect(G_OBJECT(window), "delete_event", G_CALLBACK(compose_delete_cb), compose); MANAGE_WINDOW_SIGNALS_CONNECT(window); - gtk_widget_realize(window); vbox = gtk_vbox_new(FALSE, 0); gtk_container_add(GTK_CONTAINER(window), vbox); @@ -4287,17 +4286,6 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode) gtk_text_view_set_pixels_below_lines (GTK_TEXT_VIEW(text), prefs_common.line_space / 2); - color[0] = quote_color; - cmap = gdk_window_get_colormap(window->window); - gdk_colormap_alloc_colors(cmap, color, 1, FALSE, TRUE, success); - if (success[0] == FALSE) { - GtkStyle *style; - - g_warning("Compose: color allocation failed.\n"); - style = gtk_widget_get_style(text); - quote_color = style->black; - } - n_entries = sizeof(compose_popup_entries) / sizeof(compose_popup_entries[0]); popupmenu = menu_create_items(compose_popup_entries, n_entries, @@ -4534,6 +4522,17 @@ static Compose *compose_create(PrefsAccount *account, ComposeMode mode) gtk_widget_show(window); + color[0] = quote_color; + cmap = gdk_window_get_colormap(window->window); + gdk_colormap_alloc_colors(cmap, color, 1, FALSE, TRUE, success); + if (success[0] == FALSE) { + GtkStyle *style; + + g_warning("Compose: color allocation failed.\n"); + style = gtk_widget_get_style(text); + quote_color = style->black; + } + return compose; } |