← Back to branch summary

~ubuntu-branches/debian/jessie/gnome-shell/jessie

« back to all changes in this revision

Viewing changes to src/shell-gtk-embed.c

  • Committer: Package Import Robot
  • Author(s): Michael Biebl
  • Date: 2012-05-30 13:19:38 UTC
  • mfrom: (18.1.24 experimental)
  • Revision ID: package-import@ubuntu.com-20120530131938-i3trc1g1p3is2u6x
Tags: 3.4.1-3
Upload to unstable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/shell-gtk-embed.c
136
136
  if (embed->priv->window
137
137
      && gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
138
138
    {
139
 
      GtkRequisition requisition;
140
 
      gtk_widget_size_request (GTK_WIDGET (embed->priv->window), &requisition);
 
139
      GtkRequisition min_req, natural_req;
 
140
      gtk_widget_get_preferred_size (GTK_WIDGET (embed->priv->window), &min_req, &natural_req);
141
141
 
142
 
      *min_width_p = *natural_width_p = requisition.width;
 
142
      *min_width_p = min_req.width;
 
143
      *natural_width_p = natural_req.width;
143
144
    }
144
145
  else
145
146
    *min_width_p = *natural_width_p = 0;
156
157
  if (embed->priv->window
157
158
      && gtk_widget_get_visible (GTK_WIDGET (embed->priv->window)))
158
159
    {
159
 
      GtkRequisition requisition;
160
 
      gtk_widget_size_request (GTK_WIDGET (embed->priv->window), &requisition);
 
160
      GtkRequisition min_req, natural_req;
 
161
      gtk_widget_get_preferred_size (GTK_WIDGET (embed->priv->window), &min_req, &natural_req);
161
162
 
162
 
      *min_height_p = *natural_height_p = requisition.height;
 
163
      *min_height_p = min_req.height;
 
164
      *natural_height_p = natural_req.height;
163
165
    }
164
166
  else
165
167
    *min_height_p = *natural_height_p = 0;