Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package fcitx5-qt for openSUSE:Factory checked in at 2022-03-12 17:15:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/fcitx5-qt (Old) and /work/SRC/openSUSE:Factory/.fcitx5-qt.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "fcitx5-qt" Sat Mar 12 17:15:26 2022 rev:3 rq:961191 version:5.0.11 Changes: -------- --- /work/SRC/openSUSE:Factory/fcitx5-qt/fcitx5-qt.changes 2022-02-13 00:16:12.016252990 +0100 +++ /work/SRC/openSUSE:Factory/.fcitx5-qt.new.25692/fcitx5-qt.changes 2022-03-12 17:16:09.454352839 +0100 @@ -1,0 +2,7 @@ +Sat Mar 12 08:44:23 UTC 2022 - Marguerite Su <[email protected]> + +- update version 5.0.11 + * Use highlight color from fcitx theme in client side input + window, instead of Qt. + +------------------------------------------------------------------- Old: ---- fcitx5-qt-5.0.10.tar.xz New: ---- fcitx5-qt-5.0.11.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ fcitx5-qt.spec ++++++ --- /var/tmp/diff_new_pack.zf8DJS/_old 2022-03-12 17:16:09.982353450 +0100 +++ /var/tmp/diff_new_pack.zf8DJS/_new 2022-03-12 17:16:09.986353454 +0100 @@ -29,7 +29,7 @@ %endif Name: fcitx5-qt -Version: 5.0.10 +Version: 5.0.11 Release: 0 Summary: Qt library and IM module for fcitx5 License: BSD-3-Clause AND LGPL-2.1-or-later ++++++ fcitx5-qt-5.0.10.tar.xz -> fcitx5-qt-5.0.11.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.10/CMakeLists.txt new/fcitx5-qt-5.0.11/CMakeLists.txt --- old/fcitx5-qt-5.0.10/CMakeLists.txt 2022-02-02 00:50:38.895382600 +0100 +++ new/fcitx5-qt-5.0.11/CMakeLists.txt 2022-03-09 19:25:59.387067800 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.16) -project(fcitx5-qt VERSION 5.0.10) +project(fcitx5-qt VERSION 5.0.11) set(FCITX5_QT_VERSION ${PROJECT_VERSION}) set(REQUIRED_QT4_VERSION 4.8.0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.10/po/ko.po new/fcitx5-qt-5.0.11/po/ko.po --- old/fcitx5-qt-5.0.10/po/ko.po 2021-06-25 17:39:59.237452000 +0200 +++ new/fcitx5-qt-5.0.11/po/ko.po 2022-03-08 02:54:26.669525000 +0100 @@ -5,15 +5,15 @@ # Translators: # csslayer <[email protected]>, 2017 # Bon Keun Seo <[email protected]>, 2017 -# Jung Hee Lee <[email protected]>, 2021 +# JungHee Lee <[email protected]>, 2022 # msgid "" msgstr "" "Project-Id-Version: fcitx5-qt\n" "Report-Msgid-Bugs-To: [email protected]\n" -"POT-Creation-Date: 2021-06-05 20:25+0000\n" +"POT-Creation-Date: 2022-03-01 20:24+0000\n" "PO-Revision-Date: 2017-12-20 02:52+0000\n" -"Last-Translator: Jung Hee Lee <[email protected]>, 2021\n" +"Last-Translator: JungHee Lee <[email protected]>, 2022\n" "Language-Team: Korean (https://www.transifex.com/fcitx/teams/12005/ko/)\n" "Language: ko\n" "MIME-Version: 1.0\n" @@ -105,7 +105,7 @@ #: qt5/guiwrapper/wrapperapp.cpp:35 msgid "Config path" -msgstr "?????? ??????" +msgstr "?????? ??????" #: qt5/quickphrase-editor/editor.cpp:271 msgid "Confirm deletion" @@ -147,7 +147,7 @@ #: qt5/guiwrapper/mainwindow.cpp:107 msgid "Failed to notify Fcitx about the configuration change." -msgstr "???????????? ????????? ?????? Fcitx??? ????????? ???????????????." +msgstr "?????? ????????? ?????? Fcitx??? ????????? ???????????????." #: qt5/quickphrase-editor/editor.cpp:237 qt5/quickphrase-editor/editor.cpp:279 msgid "File Operation Failed" @@ -199,7 +199,7 @@ #: qt5/guiwrapper/wrapperapp.cpp:33 msgid "Test if config exists" -msgstr "????????? ????????? ??????" +msgstr "????????? ????????? ??????" #: qt5/quickphrase-editor/editor.cpp:86 msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.10/qt5/platforminputcontext/fcitxcandidatewindow.cpp new/fcitx5-qt-5.0.11/qt5/platforminputcontext/fcitxcandidatewindow.cpp --- old/fcitx5-qt-5.0.10/qt5/platforminputcontext/fcitxcandidatewindow.cpp 2022-01-20 20:57:02.854456400 +0100 +++ new/fcitx5-qt-5.0.11/qt5/platforminputcontext/fcitxcandidatewindow.cpp 2022-02-07 19:10:26.531330800 +0100 @@ -307,12 +307,12 @@ } } -void UpdateLayout(QTextLayout &layout, const QFont &font, +void UpdateLayout(QTextLayout &layout, const FcitxTheme &theme, std::initializer_list< std::reference_wrapper<const FcitxQtFormattedPreeditList>> texts) { layout.clearFormats(); - layout.setFont(font); + layout.setFont(theme.font()); QVector<QTextLayout::FormatRange> formats; QString str; int pos = 0; @@ -333,13 +333,8 @@ format.setFontItalic(true); } if (preedit.format() & FcitxTextFormatFlag_HighLight) { - QBrush brush; - QPalette palette; - palette = QGuiApplication::palette(); - format.setBackground(QBrush(QColor( - palette.color(QPalette::Active, QPalette::Highlight)))); - format.setForeground(QBrush(QColor(palette.color( - QPalette::Active, QPalette::HighlightedText)))); + format.setBackground(theme.highlightBackgroundColor()); + format.setForeground(theme.highlightColor()); } formats.append(QTextLayout::FormatRange{ pos, static_cast<int>(preedit.string().length()), format}); @@ -370,7 +365,7 @@ return; } - UpdateLayout(upperLayout_, theme_->font(), {auxUp, preedit}); + UpdateLayout(upperLayout_, *theme_, {auxUp, preedit}); if (cursorpos >= 0) { int auxUpLength = 0; for (const auto &auxUpText : auxUp) { @@ -384,7 +379,7 @@ cursor_ = -1; } doLayout(upperLayout_); - UpdateLayout(lowerLayout_, theme_->font(), {auxDown}); + UpdateLayout(lowerLayout_, *theme_, {auxDown}); doLayout(lowerLayout_); labelLayouts_.clear(); candidateLayouts_.clear(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.10/qt5/platforminputcontext/fcitxtheme.cpp new/fcitx5-qt-5.0.11/qt5/platforminputcontext/fcitxtheme.cpp --- old/fcitx5-qt-5.0.10/qt5/platforminputcontext/fcitxtheme.cpp 2021-02-17 02:40:00.703908400 +0100 +++ new/fcitx5-qt-5.0.11/qt5/platforminputcontext/fcitxtheme.cpp 2022-02-07 19:10:26.531330800 +0100 @@ -228,7 +228,7 @@ fullWidthHighlight_ = readBool(settings, "FullWidthHighlight", true); highlightColor_ = readColor(settings, "HighlightColor", "#ffffff"); highlightBackgroundColor_ = - readColor(settings, "HighlightColor", "#a5a5a5"); + readColor(settings, "HighlightBackgroundColor", "#a5a5a5"); settings.beginGroup("ContentMargin"); contentMargin_ = readMargin(settings); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fcitx5-qt-5.0.10/qt5/platforminputcontext/fcitxtheme.h new/fcitx5-qt-5.0.11/qt5/platforminputcontext/fcitxtheme.h --- old/fcitx5-qt-5.0.10/qt5/platforminputcontext/fcitxtheme.h 2021-01-27 19:35:31.638446000 +0100 +++ new/fcitx5-qt-5.0.11/qt5/platforminputcontext/fcitxtheme.h 2022-02-07 19:10:26.531330800 +0100 @@ -73,6 +73,10 @@ const auto &next() const { return next_; } const auto &font() const { return font_; } const auto &fontMetrics() const { return fontMetrics_; } + const auto &highlightBackgroundColor() const { + return highlightBackgroundColor_; + } + const auto &highlightColor() const { return highlightColor_; } auto contentMargin() const { return contentMargin_; } auto textMargin() const { return textMargin_; } auto highlightClickMargin() const { return highlightClickMargin_; }
