summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--deadbeef.glade108
-rw-r--r--gtkplaylist.c5
-rw-r--r--interface.c61
-rw-r--r--search.c12
4 files changed, 5 insertions, 181 deletions
diff --git a/deadbeef.glade b/deadbeef.glade
index b8ec1d63..14c1bee2 100644
--- a/deadbeef.glade
+++ b/deadbeef.glade
@@ -516,114 +516,6 @@
<property name="fill">True</property>
</packing>
</child>
-
- <child>
- <widget class="GtkHBox" id="hbox5">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkCheckButton" id="voice1">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_voice1_clicked" last_modification_time="Fri, 31 Jul 2009 13:54:09 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="voice2">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_voice2_clicked" last_modification_time="Fri, 31 Jul 2009 13:54:14 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="voice3">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_voice3_clicked" last_modification_time="Fri, 31 Jul 2009 13:54:18 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="voice4">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_voice4_clicked" last_modification_time="Fri, 31 Jul 2009 13:54:22 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkCheckButton" id="voice5">
- <property name="visible">True</property>
- <property name="label" translatable="yes"></property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">True</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- <signal name="clicked" handler="on_voice5_clicked" last_modification_time="Fri, 31 Jul 2009 14:04:00 GMT"/>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
</widget>
<packing>
<property name="padding">0</property>
diff --git a/gtkplaylist.c b/gtkplaylist.c
index 41624580..4b5fc43b 100644
--- a/gtkplaylist.c
+++ b/gtkplaylist.c
@@ -125,6 +125,11 @@ gtkpl_setup_scrollbar (gtkplaylist_t *ps) {
size = 0;
}
GtkWidget *scroll = ps->scrollbar;
+ if (ps->scrollpos > (*ps->pcount)-ps->nvisiblerows+1) {
+ int n = (*ps->pcount) - ps->nvisiblerows + 1;
+ ps->scrollpos = max (0, n);
+ gtk_range_set_value (GTK_RANGE (scroll), ps->scrollpos);
+ }
if (size == 0) {
gtk_widget_hide (scroll);
}
diff --git a/interface.c b/interface.c
index 8acf9333..0f06bf18 100644
--- a/interface.c
+++ b/interface.c
@@ -86,12 +86,6 @@ create_mainwin (void)
GtkWidget *image6;
GtkWidget *vbox2;
GtkWidget *volume;
- GtkWidget *hbox5;
- GtkWidget *voice1;
- GtkWidget *voice2;
- GtkWidget *voice3;
- GtkWidget *voice4;
- GtkWidget *voice5;
GtkWidget *playpos;
GtkWidget *_;
GtkWidget *vbox3;
@@ -344,40 +338,6 @@ create_mainwin (void)
GTK_WIDGET_UNSET_FLAGS (volume, GTK_CAN_FOCUS);
gtk_scale_set_draw_value (GTK_SCALE (volume), FALSE);
- hbox5 = gtk_hbox_new (FALSE, 0);
- gtk_widget_show (hbox5);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox5, TRUE, TRUE, 0);
-
- voice1 = gtk_check_button_new_with_mnemonic ("");
- gtk_widget_show (voice1);
- gtk_box_pack_start (GTK_BOX (hbox5), voice1, FALSE, FALSE, 0);
- GTK_WIDGET_UNSET_FLAGS (voice1, GTK_CAN_FOCUS);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (voice1), TRUE);
-
- voice2 = gtk_check_button_new_with_mnemonic ("");
- gtk_widget_show (voice2);
- gtk_box_pack_start (GTK_BOX (hbox5), voice2, FALSE, FALSE, 0);
- GTK_WIDGET_UNSET_FLAGS (voice2, GTK_CAN_FOCUS);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (voice2), TRUE);
-
- voice3 = gtk_check_button_new_with_mnemonic ("");
- gtk_widget_show (voice3);
- gtk_box_pack_start (GTK_BOX (hbox5), voice3, FALSE, FALSE, 0);
- GTK_WIDGET_UNSET_FLAGS (voice3, GTK_CAN_FOCUS);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (voice3), TRUE);
-
- voice4 = gtk_check_button_new_with_mnemonic ("");
- gtk_widget_show (voice4);
- gtk_box_pack_start (GTK_BOX (hbox5), voice4, FALSE, FALSE, 0);
- GTK_WIDGET_UNSET_FLAGS (voice4, GTK_CAN_FOCUS);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (voice4), TRUE);
-
- voice5 = gtk_check_button_new_with_mnemonic ("");
- gtk_widget_show (voice5);
- gtk_box_pack_start (GTK_BOX (hbox5), voice5, FALSE, FALSE, 0);
- GTK_WIDGET_UNSET_FLAGS (voice5, GTK_CAN_FOCUS);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (voice5), TRUE);
-
playpos = gtk_hscale_new (GTK_ADJUSTMENT (gtk_adjustment_new (0, 0, 1000, 0, 0, 0)));
gtk_widget_show (playpos);
gtk_box_pack_start (GTK_BOX (hbox2), playpos, FALSE, TRUE, 0);
@@ -495,21 +455,6 @@ create_mainwin (void)
g_signal_connect ((gpointer) volume, "value_changed",
G_CALLBACK (on_volume_value_changed),
NULL);
- g_signal_connect ((gpointer) voice1, "clicked",
- G_CALLBACK (on_voice1_clicked),
- NULL);
- g_signal_connect ((gpointer) voice2, "clicked",
- G_CALLBACK (on_voice2_clicked),
- NULL);
- g_signal_connect ((gpointer) voice3, "clicked",
- G_CALLBACK (on_voice3_clicked),
- NULL);
- g_signal_connect ((gpointer) voice4, "clicked",
- G_CALLBACK (on_voice4_clicked),
- NULL);
- g_signal_connect ((gpointer) voice5, "clicked",
- G_CALLBACK (on_voice5_clicked),
- NULL);
g_signal_connect ((gpointer) playpos, "value_changed",
G_CALLBACK (on_playpos_value_changed),
NULL);
@@ -638,12 +583,6 @@ create_mainwin (void)
GLADE_HOOKUP_OBJECT (mainwin, image6, "image6");
GLADE_HOOKUP_OBJECT (mainwin, vbox2, "vbox2");
GLADE_HOOKUP_OBJECT (mainwin, volume, "volume");
- GLADE_HOOKUP_OBJECT (mainwin, hbox5, "hbox5");
- GLADE_HOOKUP_OBJECT (mainwin, voice1, "voice1");
- GLADE_HOOKUP_OBJECT (mainwin, voice2, "voice2");
- GLADE_HOOKUP_OBJECT (mainwin, voice3, "voice3");
- GLADE_HOOKUP_OBJECT (mainwin, voice4, "voice4");
- GLADE_HOOKUP_OBJECT (mainwin, voice5, "voice5");
GLADE_HOOKUP_OBJECT (mainwin, playpos, "playpos");
GLADE_HOOKUP_OBJECT (mainwin, _, "_");
GLADE_HOOKUP_OBJECT (mainwin, vbox3, "vbox3");
diff --git a/search.c b/search.c
index 841b0063..824cee62 100644
--- a/search.c
+++ b/search.c
@@ -87,18 +87,6 @@ on_searchentry_changed (GtkEditable *editable,
extern gtkplaylist_t search_playlist;
gtkplaylist_t *ps = &search_playlist;
gtkpl_setup_scrollbar (ps);
- gtk_range_set_value (GTK_RANGE (ps->scrollbar), 0);
- ps->scrollpos = 0;
-#if 0
- int n = gtk_range_get_value (GTK_RANGE (ps->scrollbar));
- printf ("scroll=%d/size=%d\n", n, search_count);
- if (n >= search_count) {
- gtk_range_set_value (GTK_RANGE (ps->scrollbar), max (0, search_count-1));
- }
- if (ps->row >= search_count) {
- ps->row = search_count-1;
- }
-#endif
memset (ps->fmtcache, 0, sizeof (int16_t) * 3 * pl_ncolumns * ps->nvisiblerows);
gtkpl_draw_playlist (ps, 0, 0, ps->playlist->allocation.width, ps->playlist->allocation.height);
gtkpl_expose (ps, 0, 0, ps->playlist->allocation.width, ps->playlist->allocation.height);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 01:56:34 +0000