commit 7ac0e152bbae9b2fa914776cbfa5db99f5e3c206
Author: Xavier de Blas <xaviblas gmail com>
Date: Wed May 27 19:01:39 2015 +0200
Curves graph has 1/2 Chronojump windo width
glade/chronojump.glade | 172 +++++++++++++++++++++++++++++++++++++++++++++++-
src/gui/encoder.cs | 10 ++-
2 files changed, 178 insertions(+), 4 deletions(-)
---
diff --git a/glade/chronojump.glade b/glade/chronojump.glade
index 53e3d10..532eb0c 100644
--- a/glade/chronojump.glade
+++ b/glade/chronojump.glade
@@ -7938,6 +7938,15 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -8908,6 +8917,15 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
<child>
@@ -10130,6 +10148,15 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">2</property>
@@ -10993,6 +11020,15 @@ Second Chronopic to platforms.</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="position">4</property>
@@ -16967,7 +17003,6 @@ on current Chronojump version.</property>
<widget class="GtkScrolledWindow"
id="scrolledwindow11">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="hscrollbar_policy">automatic</property>
<property
name="vscrollbar_policy">automatic</property>
<child>
<widget class="GtkViewport"
id="viewport_image_encoder_capture">
@@ -22133,6 +22168,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -22904,6 +22948,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -24167,6 +24220,15 @@ by you</property>
<placeholder/>
</child>
<child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
<widget class="GtkButton" id="button_video_url">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -24487,6 +24549,15 @@ by you</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="expand">True</property>
@@ -34880,6 +34951,60 @@ options</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37031,6 +37156,15 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -37840,6 +37974,15 @@ To differentiate between male and female, use the values 1/0, or m/f, or M/F on
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -40615,6 +40758,15 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
<packing>
<property name="left_attach">2</property>
@@ -41050,6 +41202,15 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
@@ -41500,6 +41661,15 @@ show elevation as:</property>
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/encoder.cs b/src/gui/encoder.cs
index f1c0512..2244386 100644
--- a/src/gui/encoder.cs
+++ b/src/gui/encoder.cs
@@ -4543,9 +4543,13 @@ public partial class ChronoJumpWindow
if(action == encoderActions.CURVES || action == encoderActions.LOAD)
{
//______ 1) prepareEncoderGraphs
- //image is inside (is smaller than) viewport
- image_encoder_width = UtilGtk.WidgetWidth(viewport_image_encoder_capture)-5;
- image_encoder_height = UtilGtk.WidgetHeight(viewport_image_encoder_capture)-5;
+
+ //image_encoder_width =
UtilGtk.WidgetWidth(viewport_image_encoder_capture)-5;
+ //make graph half width of Chronojump window
+ image_encoder_width = Convert.ToInt32(UtilGtk.WidgetWidth(app1) / 2);
+
+ //-2 to accomadate the width slider without needing a height slider
+ image_encoder_height = UtilGtk.WidgetHeight(viewport_image_encoder_capture)
-2;
prepareEncoderGraphs(true);