Changeset 55

Timestamp:

02/03/09 09:22:18 (3 years ago)

Author:

mirko

Message:

minor changes

Location:

branches/clutter-experiments

Files:

• main.cc (modified) (6 diffs)
• page.hh (modified) (7 diffs)

branches/clutter-experiments/main.cc

@@ -66 +66 @@
       ClutterColor stage_color;
       the_stage_m = clutter_stage_get_default();
+      clutter_actor_set_size(the_stage_m, 1024, 768);
       clutter_color_parse("Black", &stage_color);
       clutter_stage_set_color(CLUTTER_STAGE(the_stage_m), &stage_color);
@@ -80 +81 @@
       if(active_document == NULL)
         {
-          g_print(_("PDF file %s cannot be opened, check it exists, permissions"
+          g_print(_("PDF file %s cannot be opened,"
+                    " check that it exists, permissions"
                     " and that is \nnot encrypted.\n"), filename_m);
           return false;
@@ -99 +101 @@
         clutter_text_new_full("Mono 36", "0%", &label_color);
       guint screen_w, screen_h;
-      clutter_actor_get_size(CLUTTER_ACTOR(the_stage_m), &screen_w, &screen_h);
-      clutter_actor_set_position(progress_label_m, screen_w>>1, screen_h>>1);
+      clutter_actor_get_size(CLUTTER_ACTOR(the_stage_m), 
+                             &screen_w, &screen_h);
+      clutter_actor_set_position(progress_label_m, 
+                                 screen_w>>1, screen_h>>1);
       clutter_actor_set_anchor_point_from_gravity(progress_label_m, 
                                                   CLUTTER_GRAVITY_CENTER);
@@ -107 +111 @@
       clutter_actor_show(the_stage_m);
       g_thread_create(render_thread, this, FALSE, NULL);
-
+      
       clutter_threads_enter();
       clutter_main();
@@ -152 +156 @@
       GdkPixbuf* buffer = me->the_doc_m->page(0).pixbuf(pdfcube::page::HI_RES);
       me->current_page_m = clutter_texture_new();
+      clutter_texture_set_filter_quality
+        (CLUTTER_TEXTURE(me->current_page_m), 
+         CLUTTER_TEXTURE_QUALITY_HIGH);
       clutter_texture_set_from_rgb_data 
         (CLUTTER_TEXTURE(me->current_page_m),
@@ -161 +168 @@
          4, (ClutterTextureFlags)0,
          &error);
+
       guint screen_w, screen_h;
       clutter_actor_get_size(CLUTTER_ACTOR(me->the_stage_m), 
                              &screen_w, &screen_h);
-      clutter_actor_set_size(me->current_page_m, screen_w, screen_h);
+      
+      
+      // Check if our slot ratio is less or more than owr own
+      double aspect = me->the_doc_m->page(0).aspect_ratio();
+      
+      double w = 0.0, h = 0.0;
+      if(screen_h > screen_w/aspect)
+        {
+          w = screen_w;
+          h = w/aspect;
+        }
+      else 
+        {
+          h = screen_h;
+          w = h*aspect;
+        }
+      
+      clutter_actor_set_size(me->current_page_m, w, h);
       clutter_group_add_many(CLUTTER_GROUP(me->the_stage_m), 
                              me->current_page_m, NULL);

branches/clutter-experiments/page.hh

@@ -1 +1 @@
 // TODO: move implementation in .cc file
 // TODO: refine api, it's somewhat ugly right now
-// TODO: should render in a thread?
+// TODO: should we render in a thread?
 #ifndef __PDFCUBE__PAGE_HH__
 #define __PDFCUBE__PAGE_HH__
@@ -7 +7 @@
 #include <glib.h>
 #include <poppler.h>
-//#include <clutter/clutter.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
@@ -18 +17 @@
    *
    * This class is used to render low and hi res version of a
-   * PopplerPage as a ClutterActor.
+   * PopplerPage as GdkPixbufs
    *
-   * Usually on start all the pages will be rendered in a low res
+   * Usually, on start, all the pages will be rendered in a low res
    * version, while higher res versions will be rendered on demand by
    * the animations. We need to program the animations in advance so
@@ -65 +64 @@
     
     /**
-     * @brief Renders the PopplerPage on the desired actor.
+     * @brief Renders the PopplerPage on the desired pixbuf.
      */
     void
@@ -91 +90 @@
               }
 
-            // GdkPixbuf* low_res_m = NULL;
             if(!low_res_m)
               low_res_m = gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, w, h);
@@ -107 +105 @@
           {
             int w, h;
-            // we assume 4/3 aspect monitor can do better
+            // we assume 4/3 aspect monitor can be done better
             double box_w = 1600;
             double box_h = 1200;
@@ -132 +130 @@
                                           0, 
                                           hi_res_m);
-            GError* error = 0;
-            
-            /*
-            if(!hi_res_m) hi_res_m = clutter_texture_new();
-            clutter_texture_set_from_rgb_data 
-               (CLUTTER_TEXTURE(hi_res_m),
-                gdk_pixbuf_get_pixels(buffer),
-                gdk_pixbuf_get_has_alpha(buffer),
-                gdk_pixbuf_get_width(buffer),
-                gdk_pixbuf_get_height(buffer),
-                gdk_pixbuf_get_rowstride(buffer),
-                4, (ClutterTextureFlags)0,
-                &error);
-            g_object_unref(buffer);
-            */
             break;
           }