[chronojump] person_select_window scrolled1 improvements for raspberry
- From: Xavier de Blas <xaviblas src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [chronojump] person_select_window scrolled1 improvements for raspberry
- Date: Tue, 24 Nov 2020 16:05:22 +0000 (UTC)
commit dd633abf52c6dfe8786d58a475fba329aeda96a9
Author: Xavier de Blas <xaviblas gmail com>
Date: Tue Nov 24 17:04:46 2020 +0100
person_select_window scrolled1 improvements for raspberry
glade/person_select_window.glade | 17 ++++++++++++++---
src/gui/app1/chronojumpPersons.cs | 2 +-
src/gui/person/personSelect.cs | 21 +++++++++++++++------
3 files changed, 30 insertions(+), 10 deletions(-)
---
diff --git a/glade/person_select_window.glade b/glade/person_select_window.glade
index 763bd700..19982087 100644
--- a/glade/person_select_window.glade
+++ b/glade/person_select_window.glade
@@ -3,7 +3,6 @@
<!-- interface-requires gtk+ 3.0 -->
<!-- interface-naming-policy toplevel-contextual -->
<widget class="GtkWindow" id="person_select_window">
- <property name="width_request">820</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -30,11 +29,11 @@
<property name="label_yalign">1</property>
<property name="shadow_type">in</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow1">
+ <widget class="GtkScrolledWindow" id="scrolled1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="border_width">4</property>
- <property name="hscrollbar_policy">automatic</property>
+ <property name="hscrollbar_policy">never</property>
<property name="vscrollbar_policy">automatic</property>
<child>
<widget class="GtkViewport" id="viewport1">
@@ -2577,6 +2576,18 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</widget>
</child>
</widget>
diff --git a/src/gui/app1/chronojumpPersons.cs b/src/gui/app1/chronojumpPersons.cs
index 481fb317..0e56281a 100644
--- a/src/gui/app1/chronojumpPersons.cs
+++ b/src/gui/app1/chronojumpPersons.cs
@@ -410,7 +410,7 @@ public partial class ChronoJumpWindow
currentSession.UniqueID,
false); //means: do not returnPersonAndPSlist
- personSelectWin = PersonSelectWindow.Show(app1, myPersons, currentPerson,
preferences.colorBackground);
+ personSelectWin = PersonSelectWindow.Show(app1, myPersons, currentPerson,
preferences.colorBackground, configChronojump.Raspberry);
personSelectWin.FakeButtonAddPerson.Clicked += new
EventHandler(on_button_top_person_add_person);
personSelectWin.FakeButtonAddPersonMultiple.Clicked += new
EventHandler(on_button_top_person_add_person_multiple);
personSelectWin.FakeButtonLoadPerson.Clicked += new
EventHandler(on_button_top_person_load_person);
diff --git a/src/gui/person/personSelect.cs b/src/gui/person/personSelect.cs
index 28d33017..868fcbae 100644
--- a/src/gui/person/personSelect.cs
+++ b/src/gui/person/personSelect.cs
@@ -30,6 +30,7 @@ public class PersonSelectWindow
{
[Widget] Gtk.Window person_select_window;
[Widget] Gtk.Notebook notebook;
+ [Widget] Gtk.ScrolledWindow scrolled1;
[Widget] Gtk.Viewport viewport1;
[Widget] Gtk.Viewport viewport_person_name;
[Widget] Gtk.Table table1;
@@ -69,12 +70,20 @@ public class PersonSelectWindow
private List<PersonPhotoButton> list_ppb;
- PersonSelectWindow (Gtk.Window parent) {
+ PersonSelectWindow (Gtk.Window parent, bool raspberry)
+ {
Glade.XML gladeXML;
gladeXML = Glade.XML.FromAssembly (Util.GetGladePath() + "person_select_window.glade",
"person_select_window", "chronojump");
gladeXML.Autoconnect(this);
- viewport1.HeightRequest = 170 * 3 + 8 * 2 + 4 * 2; //170 is button height, 8 is padding top
botton (4+4), 4 the top and bottom of viewport1
+ int slidebarSize = 20;
+ if(raspberry)
+ slidebarSize = 40;
+
+ scrolled1.WidthRequest = 150 * 4 + 8 * 2 + 12 * 2 + slidebarSize; //150 is button width, 8 is
padding left and right (4+4), 12 the left and right of scrolled1
+
+ //there's no side slidebar for going horizontal, but the last +10 is to have a bit of space
for the widget
+ scrolled1.HeightRequest = 170 * 3 + 8 * 2 + 12 * 2; //170 is button height, 8 is padding top
botton (4+4), 12 the top and bottom of scrolled1
//put an icon to window
UtilGtk.IconWindow(person_select_window);
@@ -120,10 +129,10 @@ public class PersonSelectWindow
image_close.Pixbuf = pixbuf;
}
- static public PersonSelectWindow Show (Gtk.Window parent, ArrayList persons, Person currentPerson,
Gdk.Color colorBackground)
+ static public PersonSelectWindow Show (Gtk.Window parent, ArrayList persons, Person currentPerson,
Gdk.Color colorBackground, bool raspberry)
{
if (PersonSelectWindowBox == null) {
- PersonSelectWindowBox = new PersonSelectWindow (parent);
+ PersonSelectWindowBox = new PersonSelectWindow (parent, raspberry);
}
PersonSelectWindowBox.persons = persons;
@@ -135,9 +144,9 @@ public class PersonSelectWindow
PersonSelectWindowBox.hbox_up_down_close.Sensitive = true;
PersonSelectWindowBox.createTable();
-
+
PersonSelectWindowBox.person_select_window.Show ();
-
+
return PersonSelectWindowBox;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]