LadybirdBrowser/ladybird
1
1
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-09-20 17:58:18 +03:00
Code Issues Packages Projects Releases Wiki Activity

Welcome: Replace PNG background with gradient

Browse Source 
This allows scaling to larger window sizes, something that the PNG
didn't do well.
This commit is contained in:
thatlittlegit 2020-02-13 23:47:49 -05:00 committed by Andreas Kling
parent d647749737
commit 783f5dc07f
Notes: sideshowbarker 2024-07-19 17:41:40 +09:00 
Author: https://github.com/thatlittlegit
Commit: https://github.com/SerenityOS/serenity/commit/783f5dc07f3
Pull-request: https://github.com/SerenityOS/serenity/pull/1221
Reviewed-by: https://github.com/shannonbooth
5 changed files with 98 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
Applications/Welcome/BackgroundWidget.cpp Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "BackgroundWidget.h"
#include <LibGUI/Painter.h>
#include <LibGfx/Color.h>
#include <LibGfx/Palette.h>
BackgroundWidget::BackgroundWidget(GUI::Widget* parent)
: GUI::Frame(parent)
{
}
BackgroundWidget::~BackgroundWidget()
{
}
void BackgroundWidget::paint_event(GUI::PaintEvent& event)
{
GUI::Frame::paint_event(event);
GUI::Painter painter(*this);
painter.add_clip_rect(event.rect());
painter.fill_rect_with_gradient(event.rect(), Color::from_rgb(0xccdddd), Color::from_rgb(0xdcdcde));
}
void BackgroundWidget::resize_event(GUI::ResizeEvent& event)
{
GUI::Widget::resize_event(event);
}

40
Applications/Welcome/BackgroundWidget.h Normal file
View File

@ -0,0 +1,40 @@
/*
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#pragma once
#include <LibGUI/Frame.h>
class BackgroundWidget : public GUI::Frame {
C_OBJECT(BackgroundWidget)
public:
explicit BackgroundWidget(GUI::Widget* parent = nullptr);
virtual ~BackgroundWidget() override;
private:
virtual void paint_event(GUI::PaintEvent&) override;
virtual void resize_event(GUI::ResizeEvent&) override;
};

7
Applications/Welcome/Makefile
View File

@ -1,15 +1,10 @@
OBJS = \
main.o \
TextWidget.o \
background.png.o
BackgroundWidget.o
PROGRAM = Welcome
LIB_DEPS = GUI Gfx IPC Core
.SUFFIXES: .png
%.png.o: %.png
@echo "LINK $<"
$(QUIET) $(LINK) --relocatable --format binary -m elf_$(ARCH) --output $@ $<
include ../../Makefile.common

BIN
Applications/Welcome/background.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 221 KiB

13
Applications/Welcome/main.cpp
View File

@ -34,13 +34,10 @@
#include <LibGUI/StackWidget.h>
#include <LibGUI/Window.h>
#include <LibGfx/Font.h>
#include <LibGfx/PNGLoader.h>
#include "BackgroundWidget.h"
#include "TextWidget.h"
extern const u8 _binary_background_png_start[];
extern const u8 _binary_background_png_size;
struct ContentPage {
String menu_name;
String title;
@ -96,15 +93,13 @@ int main(int argc, char** argv)
window->set_resizable(true);
window->set_rect(window_rect);
auto background = GUI::Label::construct();
auto background = BackgroundWidget::construct();
window->set_main_widget(background);
background->set_fill_with_background_color(true);
background->set_fill_with_background_color(false);
background->set_layout(make<GUI::VerticalBoxLayout>());
background->layout()->set_margins({ 8, 8, 8, 8 });
background->layout()->set_margins({ 16, 8, 16, 8 });
background->layout()->set_spacing(8);
background->set_icon(Gfx::load_png_from_memory((const u8*)&_binary_background_png_start, (size_t)&_binary_background_png_size));
background->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
background->set_preferred_size(background->icon()->size());
//
// header