[geary] Code guidelines cleanup, add new files to POTFILES.in
- From: Jim Nelson <jnelson src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary] Code guidelines cleanup, add new files to POTFILES.in
- Date: Wed, 21 May 2014 00:43:30 +0000 (UTC)
commit a6719fba33aa85015e8608263c8c4a88cb2eacf4
Author: Jim Nelson <jim yorba org>
Date: Tue May 20 16:48:09 2014 -0700
Code guidelines cleanup, add new files to POTFILES.in
po/POTFILES.in | 4 ++++
src/client/composer/composer-embed.vala | 3 +--
src/client/composer/scrollable-overlay.vala | 20 +++++---------------
3 files changed, 10 insertions(+), 17 deletions(-)
---
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 361fce6..4e11a57 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,11 +28,15 @@ src/client/components/monitored-spinner.vala
src/client/components/pill-toolbar.vala
src/client/components/status-bar.vala
src/client/components/stock.vala
+src/client/composer/composer-container.vala
+src/client/composer/composer-embed.vala
+src/client/composer/composer-widget.vala
src/client/composer/composer-toolbar.vala
src/client/composer/composer-window.vala
src/client/composer/contact-entry-completion.vala
src/client/composer/contact-list-store.vala
src/client/composer/email-entry.vala
+src/client/composer/scrollable-overlay.vala
src/client/composer/webview-edit-fixer.vala
src/client/conversation-list/conversation-list-cell-renderer.vala
src/client/conversation-list/conversation-list-store.vala
diff --git a/src/client/composer/composer-embed.vala b/src/client/composer/composer-embed.vala
index d6da7f1..3c635ea 100644
--- a/src/client/composer/composer-embed.vala
+++ b/src/client/composer/composer-embed.vala
@@ -17,7 +17,6 @@ public class ComposerEmbed : Gtk.Bin, ComposerContainer {
public ComposerEmbed(ComposerWidget composer, ConversationViewer conversation_viewer,
Geary.Email? referred) {
- //Object(orientation: Gtk.Orientation.VERTICAL);
this.composer = composer;
this.conversation_viewer = conversation_viewer;
halign = Gtk.Align.FILL;
@@ -48,7 +47,7 @@ public class ComposerEmbed : Gtk.Bin, ComposerContainer {
debug("Error creating embed element: %s", error.message);
return;
}
- //pack_start(composer, true, true);
+
add(composer);
composer.editor.focus_in_event.connect(on_focus_in);
composer.editor.focus_out_event.connect(on_focus_out);
diff --git a/src/client/composer/scrollable-overlay.vala b/src/client/composer/scrollable-overlay.vala
index 811ce3e..188eeff 100644
--- a/src/client/composer/scrollable-overlay.vala
+++ b/src/client/composer/scrollable-overlay.vala
@@ -8,21 +8,13 @@ public class ScrollableOverlay : Gtk.Overlay, Gtk.Scrollable {
private Gtk.Scrollable main_child;
- public Gtk.Adjustment hadjustment {
- get; set;
- }
+ public Gtk.Adjustment hadjustment { get; set; }
- public Gtk.Adjustment vadjustment {
- get; set;
- }
+ public Gtk.Adjustment vadjustment { get; set; }
- public Gtk.ScrollablePolicy hscroll_policy {
- get; set;
- }
+ public Gtk.ScrollablePolicy hscroll_policy { get; set; }
- public Gtk.ScrollablePolicy vscroll_policy {
- get; set;
- }
+ public Gtk.ScrollablePolicy vscroll_policy { get; set; }
public ScrollableOverlay(Gtk.Scrollable main_child) {
this.main_child = main_child;
@@ -45,9 +37,7 @@ public class ScrollableOverlay : Gtk.Overlay, Gtk.Scrollable {
}
private bool on_child_position(Gtk.Widget widget, Gdk.Rectangle allocation) {
- double hscroll = hadjustment.value,
- vscroll = vadjustment.value;
- return ((ComposerEmbed) widget).set_position(ref allocation, hscroll, vscroll);
+ return ((ComposerEmbed) widget).set_position(ref allocation, hadjustment.value, vadjustment.value);
}
private void on_scroll() {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]