* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
/*
context = gtk_widget_get_style_context (widget);
state = gtk_widget_get_state_flags (widget);
+ gtk_style_context_save (context);
+ gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME);
+
gtk_style_context_get_padding (context, state, &padding);
gtk_style_context_get_border (context, state, &border);
+ gtk_style_context_restore (context);
+
if (priv->shadow_type != GTK_SHADOW_NONE)
{
view_allocation->x = border.left;
}
view_allocation->x += padding.left;
- view_allocation->y += padding.right;
+ view_allocation->y += padding.top;
view_allocation->width = MAX (1, allocation.width - padding.left - padding.right - border_width * 2);
view_allocation->height = MAX (1, allocation.height - padding.top - padding.bottom - border_width * 2);
{
GtkBin *bin = GTK_BIN (viewport);
GtkAllocation view_allocation;
- GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
+ GtkAdjustment *hadjustment = viewport->priv->hadjustment;
GtkWidget *child;
gdouble upper, value;
{
GtkBin *bin = GTK_BIN (viewport);
GtkAllocation view_allocation;
- GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
+ GtkAdjustment *vadjustment = viewport->priv->vadjustment;
GtkWidget *child;
gdouble upper;
GtkViewport *viewport = GTK_VIEWPORT (widget);
GtkViewportPrivate *priv = viewport->priv;
GtkBin *bin = GTK_BIN (widget);
- GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
- GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
+ GtkAdjustment *hadjustment = priv->hadjustment;
+ GtkAdjustment *vadjustment = priv->vadjustment;
GtkAllocation allocation;
GtkAllocation view_allocation;
GtkStyleContext *context;
context = gtk_widget_get_style_context (widget);
- if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)))
+ if (gtk_cairo_should_draw_window (cr, gtk_widget_get_window (widget)) &&
+ priv->shadow_type != GTK_SHADOW_NONE)
{
gtk_style_context_save (context);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_FRAME);
GtkViewportPrivate *priv = viewport->priv;
GtkBin *bin = GTK_BIN (widget);
guint border_width;
- GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
- GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
+ GtkAdjustment *hadjustment = priv->hadjustment;
+ GtkAdjustment *vadjustment = priv->vadjustment;
GtkAllocation child_allocation;
GtkWidget *child;
if (child && gtk_widget_get_visible (child) &&
gtk_widget_get_realized (GTK_WIDGET (viewport)))
{
- GtkAdjustment *hadjustment = gtk_viewport_get_hadjustment (viewport);
- GtkAdjustment *vadjustment = gtk_viewport_get_vadjustment (viewport);
+ GtkAdjustment *hadjustment = priv->hadjustment;
+ GtkAdjustment *vadjustment = priv->vadjustment;
gint old_x, old_y;
gint new_x, new_y;