nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code guidelines cleanup, add new files to POTFILES.in

Browse source
This commit is contained in:
Jim Nelson 2014-05-20 16:48:09 -07:00
parent b3c5abea80
commit a6719fba33
3 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
po/POTFILES.in
View file

@ -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

3
src/client/composer/composer-embed.vala
View file

@ -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);

20
src/client/composer/scrollable-overlay.vala
View file

@ -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() {