ClipboardHistory: Replace IconWidget with GUI::Image

This commit is contained in:
Hüseyin ASLITÜRK 2020-06-13 01:37:55 +03:00 committed by Andreas Kling
parent 56e82a2c07
commit 3a676c6fd2
Notes: sideshowbarker 2024-07-19 05:34:49 +09:00
4 changed files with 5 additions and 90 deletions

View file

@ -1,6 +1,5 @@
set(SOURCES
ClipboardHistoryModel.cpp
IconWidget.cpp
main.cpp
)

View file

@ -1,44 +0,0 @@
/*
* Copyright (c) 2019-2020, Sergey Bugaev <bugaevc@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 "IconWidget.h"
#include <LibGfx/Bitmap.h>
IconWidget::IconWidget()
{
set_icon(Gfx::Bitmap::load_from_file("/res/icons/clipboard.png"));
set_fill_with_background_color(true);
}
IconWidget::~IconWidget()
{
}
void IconWidget::mousedown_event(GUI::MouseEvent&)
{
if (on_click)
on_click();
}

View file

@ -1,42 +0,0 @@
/*
* Copyright (c) 2019-2020, Sergey Bugaev <bugaevc@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 <AK/Function.h>
#include <LibGUI/Label.h>
class IconWidget : public GUI::Label {
C_OBJECT(IconWidget)
public:
IconWidget();
virtual ~IconWidget() override;
Function<void()> on_click;
private:
virtual void mousedown_event(GUI::MouseEvent&) override;
};

View file

@ -25,8 +25,8 @@
*/
#include "ClipboardHistoryModel.h"
#include "IconWidget.h"
#include <LibGUI/Application.h>
#include <LibGUI/Image.h>
#include <LibGUI/TableView.h>
#include <LibGUI/Window.h>
@ -55,8 +55,10 @@ int main(int argc, char* argv[])
auto applet_window = GUI::Window::construct();
applet_window->set_title("ClipboardHistory");
applet_window->set_window_type(GUI::WindowType::MenuApplet);
auto& icon = applet_window->set_main_widget<IconWidget>();
icon.on_click = [&main_window = *main_window] {
auto& icon = applet_window->set_main_widget<GUI::Image>();
icon.load_from_file("/res/icons/clipboard.png");
icon.set_fill_with_background_color(true);
icon.on_click = [& main_window = *main_window] {
main_window.show();
};
applet_window->resize(16, 16);