callisto-debian/gtk2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix the positioning of the popup.

Browse Source 
Fri Jul 30 02:21:41 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
	Fix the positioning of the popup.
This commit is contained in:
Matthias Clasen
2004-07-30 06:22:26 +00:00
committed by Matthias Clasen
parent 32d874f83a
commit 0d360a2af9
5 changed files with 24 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jul 30 02:21:41 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
Fix the positioning of the popup.
Fri Jul 30 00:56:31 2004 Matthias Clasen <maclas@gmx.de> Fri Jul 30 00:56:31 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed): * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed):

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
Fri Jul 30 02:21:41 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
Fix the positioning of the popup.
Fri Jul 30 00:56:31 2004 Matthias Clasen <maclas@gmx.de> Fri Jul 30 00:56:31 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed): * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed):

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
Fri Jul 30 02:21:41 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
Fix the positioning of the popup.
Fri Jul 30 00:56:31 2004 Matthias Clasen <maclas@gmx.de> Fri Jul 30 00:56:31 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed): * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed):

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
Fri Jul 30 02:21:41 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c (_gtk_entry_completion_resize_popup):
Fix the positioning of the popup.
Fri Jul 30 00:56:31 2004 Matthias Clasen <maclas@gmx.de> Fri Jul 30 00:56:31 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed): * gtk/gtkcomboboxentry.c (gtk_combo_box_entry_active_changed):

6
gtk/gtkentrycompletion.c
View File

@ -1267,6 +1267,7 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
gint monitor_num; gint monitor_num;
GdkRectangle monitor; GdkRectangle monitor;
GtkRequisition popup_req; GtkRequisition popup_req;
GtkRequisition entry_req;
GtkTreePath *path; GtkTreePath *path;
gboolean above; gboolean above;
gint width; gint width;
@ -1318,15 +1319,16 @@ _gtk_entry_completion_resize_popup (GtkEntryCompletion *completion)
gtk_widget_hide (completion->priv->action_view); gtk_widget_hide (completion->priv->action_view);
gtk_widget_size_request (completion->priv->popup_window, &popup_req); gtk_widget_size_request (completion->priv->popup_window, &popup_req);
gtk_widget_size_request (completion->priv->entry, &entry_req);
if (x < monitor.x) if (x < monitor.x)
x = monitor.x; x = monitor.x;
else if (x + popup_req.width > monitor.x + monitor.width) else if (x + popup_req.width > monitor.x + monitor.width)
x = monitor.x + monitor.width - popup_req.width; x = monitor.x + monitor.width - popup_req.width;
if (y + height + popup_req.height <= monitor.y + monitor.height) if (y + entry_req.height + popup_req.height <= monitor.y + monitor.height)
{ {
y += height; y += entry_req.height;
above = FALSE; above = FALSE;
} }
else else