D28317: Adjust default color scheme and titlebar appearance for Tools Area

[Noah Davis]

ndavis added a comment.


  This time when I try to apply the patch, it fails. I have the most up to date version of D27669 <https://phabricator.kde.org/D27669> too.
  
    ╭ …/src/kde/workspace/breeze   master  
    ╰ arc patch D28317
     INFO  Base commit is not in local repository; trying to fetch.
    Created and checked out branch arcpatch-D28317.
    Branch name arcpatch-D27669 already exists; trying a new name.
    Created and checked out branch arcpatch-D27669_1.
    Checking patch kstyle/config/ui/breezestyleconfig.ui...
    Checking patch kstyle/config/breezestyleconfig.cpp...
    Checking patch kstyle/breezetoolsareamanager.h...
    Checking patch kstyle/breezetoolsareamanager.cpp...
    Checking patch kstyle/breezestyle.h...
    Checking patch kstyle/breezestyle.cpp...
    Checking patch kstyle/breezehelper.h...
    Checking patch kstyle/breezehelper.cpp...
    Checking patch kstyle/breeze.kcfg...
    Checking patch kstyle/CMakeLists.txt...
    Applied patch kstyle/config/ui/breezestyleconfig.ui cleanly.
    Applied patch kstyle/config/breezestyleconfig.cpp cleanly.
    Applied patch kstyle/breezetoolsareamanager.h cleanly.
    Applied patch kstyle/breezetoolsareamanager.cpp cleanly.
    Applied patch kstyle/breezestyle.h cleanly.
    Applied patch kstyle/breezestyle.cpp cleanly.
    Applied patch kstyle/breezehelper.h cleanly.
    Applied patch kstyle/breezehelper.cpp cleanly.
    Applied patch kstyle/breeze.kcfg cleanly.
    Applied patch kstyle/CMakeLists.txt cleanly.
     COMMITTED  Successfully committed patch.
    
    
        This diff is against commit 33be688c002cb4829fee475f0199cbffbb8dc265, but
        the commit is nowhere in the working copy. Try to apply it against the
        current working copy state? (944d47cd098ff8abf85f08823cbe7d033eee082d)
        [Y/n] y
    
    Checking patch kstyle/breezetoolsareamanager.cpp...
    error: while searching for:
                        this, [this]() {
                            emit toolbarUpdated();
                        });
    <<<<<<< HEAD
                toolbar->installEventFilter(this);
    =======
    >>>>>>> c2487fc1... [kstyle] Tools area
            }
            connect(widget, &QObject::destroyed,
                    this, [this, widget]() {
    
    error: patch failed: kstyle/breezetoolsareamanager.cpp:187
    error: while searching for:
    
        void ToolsAreaManager::unregisterWidget(QWidget *widget)
        {
    <<<<<<< HEAD
            if (qobject_cast<QToolBar*>(widget)) {
                widget->setContentsMargins(0,0,0,0);
                widget->removeEventFilter(this);
            }
    =======
            if (qobject_cast<QToolBar*>(widget)) widget->setContentsMargins(0,0,0,0);
    >>>>>>> c2487fc1... [kstyle] Tools area
            _registeredWidgets.remove(widget);
            QList<QWindow*> toRemove;
            for (auto window : animationMap.keys()) {
    
    error: patch failed: kstyle/breezetoolsareamanager.cpp:213
    Checking patch kdecoration/breezesettingsdata.kcfg...
    Checking patch kdecoration/breezebutton.cpp...
    Checking patch colors/BreezeLight.colors...
    Checking patch colors/Breeze.colors...
    Applying patch kstyle/breezetoolsareamanager.cpp with 2 rejects...
    Rejected hunk #1.
    Rejected hunk #2.
    Applied patch kdecoration/breezesettingsdata.kcfg cleanly.
    Applied patch kdecoration/breezebutton.cpp cleanly.
    Applied patch colors/BreezeLight.colors cleanly.
    Applied patch colors/Breeze.colors cleanly.
    
     Patch Failed!
    Usage Exception: Unable to apply patch!

REPOSITORY
  R31 Breeze

REVISION DETAIL
  https://phabricator.kde.org/D28317

To: ngraham, #vdg, #breeze
Cc: ndavis, niccolove, The-Feren-OS-Dev, manueljlin, davidre, broulik, plasma-devel, Orage, LeGast00n, cblack, jraleigh, zachus, fbampaloukas, ragreen, ZrenBot, ngraham, himcesjf, lesliezhai, ali-mohamed, jensreuterberg, abetts, sebas, apol, ahiemstra, mart
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.kde.org/pipermail/plasma-devel/attachments/20200423/c7325486/attachment.html>