aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <taw@bitwiz.org.uk>2013-05-13 00:15:37 +0200
committerThomas White <taw@bitwiz.org.uk>2013-05-13 00:15:37 +0200
commitb3902fdd8db499d9d21481237d39f803699cd3db (patch)
tree069bbe2997230652e85b0fbea8ba97567bffc8cc
parent6bcb069f1ee9ad409305f25f9083f7f8df0796e8 (diff)
Stuff
-rw-r--r--src/mainwindow.c8
-rw-r--r--src/stylesheet.c10
-rw-r--r--tests/render_test.c2
3 files changed, 13 insertions, 7 deletions
diff --git a/src/mainwindow.c b/src/mainwindow.c
index 6a3ffa8..2f72f6e 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -946,6 +946,12 @@ static gboolean im_commit_sig(GtkIMContext *im, gchar *str,
}
+static struct frame *find_frame_at_position(struct slide *slide,
+ double x, double y)
+{
+}
+
+
static gboolean button_press_sig(GtkWidget *da, GdkEventButton *event,
struct presentation *p)
{
@@ -955,7 +961,7 @@ static gboolean button_press_sig(GtkWidget *da, GdkEventButton *event,
x = event->x - p->border_offs_x;
y = event->y - p->border_offs_y;
- clicked = NULL;//find_object_at_position(p->cur_edit_slide, x, y);
+ clicked = find_frame_at_position(p->cur_edit_slide, x, y);
if ( clicked == NULL ) {
diff --git a/src/stylesheet.c b/src/stylesheet.c
index 8724b51..bb3880f 100644
--- a/src/stylesheet.c
+++ b/src/stylesheet.c
@@ -159,10 +159,10 @@ void default_stylesheet(StyleSheet *ss)
add_to_template(acknowledgements, sty);
sty = new_style(ss, "Content");
- sty->lop.margin_l = 0.0;
- sty->lop.margin_r = 0.0;
- sty->lop.margin_t = 0.0;
- sty->lop.margin_b = 0.0;
+ sty->lop.margin_l = 10.0;
+ sty->lop.margin_r = 10.0;
+ sty->lop.margin_t = 120.0;
+ sty->lop.margin_b = 10.0;
sty->lop.pad_l = 20.0;
sty->lop.pad_r = 20.0;
sty->lop.pad_t = 20.0;
@@ -173,7 +173,7 @@ void default_stylesheet(StyleSheet *ss)
sty->lop.h_units = UNITS_FRAC;
sty->lop.x = 0.0;
sty->lop.y = 0.0;
- sty->sc_prologue = strdup("\\bgcol{#00a6eb}\\fgcol{#ffffff}"
+ sty->sc_prologue = strdup("\\bgcol{#dddddd}\\fgcol{#ffffff}"
"\\font[Sans 24]");
add_to_template(acknowledgements, sty);
}
diff --git a/tests/render_test.c b/tests/render_test.c
index 826a9de..8a1ab3d 100644
--- a/tests/render_test.c
+++ b/tests/render_test.c
@@ -116,7 +116,7 @@ int main(int argc, char *argv[])
fr2 = calloc(1, sizeof(struct frame));
if ( fr2 == NULL ) return 1;
- fr2->sc = "Lorem ipsum dolor sit amet, consect-etur adipiscing elit.\nDonec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. Nam tincidunt congue enim, ut porta lorem lacinia consectetur. Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.";
+ fr2->sc = "\\font[Sorts Mill Goudy 32]Lorem ipsum dolor sit amet, consect-etur adipiscing elit.\n\\font[Serif 17]Donec a diam lectus. Sed sit amet ipsum mauris. Maecenas congue ligula ac quam viverra nec consectetur ante hendrerit. Donec et mollis dolor. Praesent et diam eget libero egestas mattis sit amet vitae augue. \\font[Edrip 32]{Nam tincidunt congue enim, ut porta lorem \\font[Edrip Bold 32]{lacinia} consectetur.} Donec ut libero sed arcu vehicula ultricies a non tortor. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean ut gravida lorem. Ut turpis felis, pulvinar a semper sed, adipiscing id dolor. Pellentesque auctor nisi id magna consequat sagittis. Curabitur dapibus enim sit amet elit pharetra tincidunt feugiat nisl imperdiet. Ut convallis libero in urna ultrices accumsan. Donec sed odio eros. Donec viverra mi quis quam pulvinar at malesuada arcu rhoncus. \\font[Serif Bold 17]{Cum sociis natoque penatibus et magnis dis parturient} montes, nascetur ridiculus mus. In rutrum accumsan ultricies. Mauris vitae nisi at sem facilisis semper ac in est.";
//fr2->sc = "Lorem ipsum AT";
fr2->children = NULL;
fr2->num_children = 0;