napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "[branding] adopt the enum names as keys"

Browse Source 
This reverts commit 73e4c46756.
This commit is contained in:
Philip Mueller 2023-06-03 18:35:48 +02:00
parent 73e4c46756
commit e99d0bc081
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/branding/manjaro/branding.desc
View File

@ -180,10 +180,10 @@ images:
# branding component also ships a stylesheet.qss. Then they are # branding component also ships a stylesheet.qss. Then they are
# the corresponding CSS attributes of #sidebarApp. # the corresponding CSS attributes of #sidebarApp.
style: style:
SidebarBackground: "#263238" sidebarBackground: "#263238"
SidebarText: "#efefef" sidebarText: "#efefef"
SidebarTextCurrent: "#4d915e" sidebarTextSelect: "#4d915e"
SidebarTextHighlight: "#1a1c1b" sidebarTextHighlight: "#1a1c1b"
### SLIDESHOW ### SLIDESHOW

5
src/calamares/CalamaresApplication.cpp
View File

@ -269,11 +269,10 @@ CalamaresApplication::initViewSteps()
{ {
cDebug() << "STARTUP: loadModules for all modules done"; cDebug() << "STARTUP: loadModules for all modules done";
m_moduleManager->checkRequirements(); m_moduleManager->checkRequirements();
if ( Calamares::Branding::instance()->windowFullscreen() ) if ( Calamares::Branding::instance()->windowMaximize() )
{ {
m_mainwindow->setWindowFlag( Qt::FramelessWindowHint ); m_mainwindow->setWindowFlag( Qt::FramelessWindowHint );
m_mainwindow->setWindowFlag( Qt::WindowStaysOnTopHint ); m_mainwindow->showMaximized();
m_mainwindow->showFullscreen();
} }
else else
{ {

2
src/libcalamaresui/Branding.h
View File

@ -219,7 +219,7 @@ public:
bool welcomeStyleCalamares() const { return m_welcomeStyleCalamares; } bool welcomeStyleCalamares() const { return m_welcomeStyleCalamares; }
bool welcomeExpandingLogo() const { return m_welcomeExpandingLogo; } bool welcomeExpandingLogo() const { return m_welcomeExpandingLogo; }
bool windowFullscreen() const { return m_windowExpansion == WindowExpansion::Fullscreen; } bool windowMaximize() const { return m_windowExpansion == WindowExpansion::Fullscreen; }
bool windowExpands() const { return m_windowExpansion != WindowExpansion::Fixed; } bool windowExpands() const { return m_windowExpansion != WindowExpansion::Fixed; }
QPair< WindowDimension, WindowDimension > windowSize() const QPair< WindowDimension, WindowDimension > windowSize() const
{ {