head	1.2;
access;
symbols
	pkgsrc-2016Q2:1.1.0.4
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.2
	pkgsrc-2016Q1-base:1.1;
locks; strict;
comment	@// @;


1.2
date	2016.08.20.19.00.31;	author kamil;	state dead;
branches;
next	1.1;
commitid	AWcf1S4QKqW2N4jz;

1.1
date	2016.01.03.23.37.39;	author kamil;	state Exp;
branches;
next	;
commitid	rK9ATohA7daUFxPy;


desc
@@


1.2
log
@Update otter-browser from 0.9.9 to 0.9.10

Local changes
=============
Start to depend on textproc/hunspell.

Upstream changelog
==================
Emdek released 0.9.10 on 1 May 2016

    added initial support for User Scripts;
    added Addons Manager;
    added alternative display mode and support for optional headers for URL completion in address field;
    many enhancements in experimental backend for QtWebEngine (Blink):
        added support for entering full screen mode;
        added support for content blocking;
        added support for several missing actions;
    several fixes and improvements in content blocking;
    improved CMake build system (also now it is the only officially supported);
    added new backend for storing browsing history;
    many other fixes and improvements.
@
text
@$NetBSD: patch-src_ui_OptionDelegate.cpp,v 1.1 2016/01/03 23:37:39 kamil Exp $

Fallback to QItemDelegate::paint() if type is unknown
cherry-pick from https://github.com/OtterBrowser/otter-browser/commit/fd7380a9eec71815115e5a383eea1a7dda33a52a

Patch suggested by upstream

--- src/ui/OptionDelegate.cpp.orig	2016-01-01 20:14:29.000000000 +0000
+++ src/ui/OptionDelegate.cpp
@@@@ -1,6 +1,6 @@@@
 /**************************************************************************
 * Otter Browser: Web browser controlled by the user, not vice-versa.
-* Copyright (C) 2013 - 2015 Michal Dutkiewicz aka Emdek <michal@@emdek.pl>
+* Copyright (C) 2013 - 2016 Michal Dutkiewicz aka Emdek <michal@@emdek.pl>
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
@@@@ -34,6 +34,13 @@@@ void OptionDelegate::paint(QPainter *pai
 {
 	const OptionWidget::OptionType type = getType(index);
 
+	if (type == OptionWidget::UnknownType)
+	{
+		QItemDelegate::paint(painter, option, index);
+
+		return;
+	}
+
 	drawBackground(painter, option, index);
 
 	switch (type)
@


1.1
log
@Update otter-browser to 0.9.09

Upstream changes since 0.9.08:
    added initial support for spell checking;
    added support for selecting allowed and rejected domains for third-party cookies;
    added support for customizing visible columns and their order in most of views;
    added support for customizing text and icon of toolbar entries;
    added support for adding arbitrary menus to toolbars;
    some other fixes and minor improvements.

Cherry-picked changes suggested by upstream:
    Always mark dialogs as restored (67c2ae72cc57c)
    Fallback to QItemDelegate::paint() if type is unknown (fd7380a9eec7)
    Try to return first address field from the list if none was matched (d1a1b0bbc8d80d0)
@
text
@d1 1
a1 1
$NetBSD$
@