pogmommy/rssguard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix handling of force-dark-mode when style is forced via style or env

Browse source
This commit is contained in:
Martin Rotter 2022-03-03 08:14:01 +01:00
parent 45d7a78684
commit 45751381ec
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
resources/desktop/com.github.rssguard.appdata.xml
View file

@ -26,7 +26,7 @@
<url type="donation">https://github.com/sponsors/martinrotter</url> <url type="donation">https://github.com/sponsors/martinrotter</url>
<content_rating type="oars-1.1" /> <content_rating type="oars-1.1" />
<releases> <releases>
<release version="4.1.2" date="2022-03-02"/> <release version="4.1.2" date="2022-03-03"/>
</releases> </releases>
<content_rating type="oars-1.0"> <content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute> <content_attribute id="violence-cartoon">none</content_attribute>

7
src/librssguard/miscellaneous/skinfactory.cpp
View file

@ -65,6 +65,13 @@ void SkinFactory::loadSkinFromData(const Skin& skin) {
qWarningNN << LOGSEC_GUI << "Respecting forced style(s):\n" qWarningNN << LOGSEC_GUI << "Respecting forced style(s):\n"
<< " QT_STYLE_OVERRIDE: " QUOTE_NO_SPACE(env_forced_style) << "\n" << " QT_STYLE_OVERRIDE: " QUOTE_NO_SPACE(env_forced_style) << "\n"
<< " CLI (-style): " QUOTE_NO_SPACE(cli_forced_style); << " CLI (-style): " QUOTE_NO_SPACE(cli_forced_style);
if (!cli_forced_style.isEmpty()) {
style_name = cli_forced_style;
}
else if (!env_forced_style.isEmpty()) {
style_name = env_forced_style;
}
} }
if (isStyleGoodForDarkVariant(style_name) && if (isStyleGoodForDarkVariant(style_name) &&

5
src/librssguard/services/abstract/rootitem.h
View file

@ -206,9 +206,10 @@ class RSSGUARD_DLLSPEC RootItem : public QObject {
// automatically sorted and are always sorted by title. // automatically sorted and are always sorted by title.
// //
// Sort order number cannot be negative but order of list of items with same // Sort order number cannot be negative but order of list of items with same
// parent does not have to form continuous series, for example: // parent MUST form continuous series AND start with zero, for example:
// 0, 1, 2, 3, 4, ... // 0, 1, 2, 3, 4, ...
// 5, 7, 12, 13, 19 //
// NOTE: This is checked with DatabaseQueries::fixupOrders() method on app startup.
int sortOrder() const; int sortOrder() const;
void setSortOrder(int sort_order); void setSortOrder(int sort_order);