Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions editor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,7 @@ add_subdirectory(

if (APPLE)
set(ATLAS_APP_ICON
"${CMAKE_SOURCE_DIR}/editor/assets/iconFile-iOS-Dark-1024x1024@1x.png"
CACHE FILEPATH "Atlas Engine macOS bundle icon"
CACHE FILEPATH "Atlas Engine macOS bundle icon"
)
get_filename_component(ATLAS_APP_ICON_NAME "${ATLAS_APP_ICON}" NAME)
set_source_files_properties("${ATLAS_APP_ICON}" PROPERTIES
Expand Down Expand Up @@ -135,9 +134,14 @@ qt_add_resources(AtlasEditor "atlas_editor_assets"
PREFIX "/editor"
BASE "${CMAKE_SOURCE_DIR}/editor"
FILES
"${CMAKE_SOURCE_DIR}/editor/assets/Icon-iOS-Default-1024x1024@1x.png"
"${CMAKE_SOURCE_DIR}/editor/assets/iconFile-iOS-Dark-1024x1024@1x.png"
"${CMAKE_SOURCE_DIR}/editor/assets/atlas_ball_bright.png"
"${CMAKE_SOURCE_DIR}/editor/assets/atlas-app-dev.png"
"${CMAKE_SOURCE_DIR}/editor/assets/atlas-star.png"
"${CMAKE_SOURCE_DIR}/editor/assets/check.svg"
"${CMAKE_SOURCE_DIR}/editor/assets/close.svg"
"${CMAKE_SOURCE_DIR}/editor/assets/link.svg"
"${CMAKE_SOURCE_DIR}/editor/assets/chevron-down.svg"
"${CMAKE_SOURCE_DIR}/editor/assets/chevron-up.svg"
"${CMAKE_SOURCE_DIR}/editor/assets/atlas-app.png"
"${CMAKE_SOURCE_DIR}/editor/assets/Manrope-VariableFont_wght.ttf"
"${CMAKE_SOURCE_DIR}/editor/assets/Phosphor.ttf"
"${CMAKE_SOURCE_DIR}/editor/assets/PHOSPHOR_LICENSE.txt"
Expand Down
30 changes: 0 additions & 30 deletions editor/assets/AtlasEngine.icon.json

This file was deleted.

46 changes: 46 additions & 0 deletions editor/assets/AtlasEngine.icon/Assets/atlasStarGradient.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
50 changes: 50 additions & 0 deletions editor/assets/AtlasEngine.icon/icon.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
{
"fill" : {
"linear-gradient" : [
"srgb:1.00000,0.95276,0.98370,1.00000",
"srgb:0.69138,0.67074,0.76447,1.00000"
],
"orientation" : {
"start" : {
"x" : 0.5,
"y" : 0
},
"stop" : {
"x" : 0.5,
"y" : 0.7
}
}
},
"groups" : [
{
"layers" : [
{
"fill" : "none",
"image-name" : "atlasStarGradient.svg",
"name" : "atlasStarGradient",
"position" : {
"scale" : 1.34,
"translation-in-points" : [
0,
0
]
}
}
],
"shadow" : {
"kind" : "neutral",
"opacity" : 0.5
},
"translucency" : {
"enabled" : true,
"value" : 0.3
}
}
],
"supported-platforms" : {
"circles" : [
"watchOS"
],
"squares" : "shared"
}
}
10 changes: 10 additions & 0 deletions editor/assets/AtlasEngineDev.icon/Assets/atlasStar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,16 @@
{
"layers": [
{
"image-name": "atlas_ball_bright.png",
"name": "atlas_ball_bright"
"fill": "system-light",
"image-name": "atlasStar.svg",
"name": "atlasStar",
"position": {
"scale": 1.34,
"translation-in-points": [
0,
0
]
}
}
],
"shadow": {
Expand Down
Binary file removed editor/assets/Icon-iOS-Default-1024x1024@1x.png
Binary file not shown.
Binary file added editor/assets/atlas-app-dev.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added editor/assets/atlas-app.icns
Binary file not shown.
Binary file added editor/assets/atlas-app.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added editor/assets/atlas-star.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions editor/assets/atlasStar.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 10 additions & 0 deletions editor/assets/atlasStarColored.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
46 changes: 46 additions & 0 deletions editor/assets/atlasStarGradient.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed editor/assets/atlas_ball_bright.png
Binary file not shown.
1 change: 1 addition & 0 deletions editor/assets/check.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions editor/assets/chevron-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions editor/assets/chevron-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions editor/assets/close.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified editor/assets/iconFile-iOS-Dark-1024x1024@1x.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed editor/assets/iconFile-iOS-Default-1024x1024@1x.png
Binary file not shown.
Binary file removed editor/assets/landing.png
Binary file not shown.
1 change: 1 addition & 0 deletions editor/assets/link.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 10 additions & 8 deletions editor/debug.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
*/

#include <editor/debug.h>
#include <editor/styling/workbench.h>
#include <editor/styling/icons.h>
#include <editor/widgets/scrubbableSpinBox.h>
#include <QCheckBox>
#include <QComboBox>
Expand Down Expand Up @@ -98,18 +100,18 @@ QWidget* DebugComponentsView::createBasicControlsSection() {
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(8);

auto* normalButton = new QPushButton("Normal", container);
auto* defaultButton = new QPushButton("Default", container);
auto* normalButton = new styling::Button("Normal", container);
auto* defaultButton = new styling::Button("Default", container);
defaultButton->setDefault(true);

auto* disabledButton = new QPushButton("Disabled", container);
auto* disabledButton = new styling::Button("Disabled", container);
disabledButton->setEnabled(false);

auto* checkableButton = new QPushButton("Checkable", container);
auto* checkableButton = new styling::Button("Checkable", container);
checkableButton->setCheckable(true);
checkableButton->setChecked(true);

auto* toolButton = new QToolButton(container);
auto* toolButton = new styling::ToolButton(container);
toolButton->setText("Tool");

layout->addWidget(normalButton);
Expand Down Expand Up @@ -354,13 +356,13 @@ QWidget* DebugComponentsView::createCollapsibleSection() {
layout->setContentsMargins(0, 0, 0, 0);
layout->setSpacing(4);

auto* header = new QToolButton(section);
auto* header = new styling::ToolButton(section);
header->setObjectName("collapsibleHeader");
header->setText("Transform");
header->setCheckable(true);
header->setChecked(true);
header->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
header->setArrowType(Qt::DownArrow);
header->setIcon(styling::icon(styling::Icon::CaretDown));

auto* body = new QWidget(section);
body->setObjectName("collapsibleBody");
Expand Down Expand Up @@ -390,7 +392,7 @@ QWidget* DebugComponentsView::createCollapsibleSection() {
form->addRow("Visibility", visible);

QObject::connect(header, &QToolButton::toggled, section, [header, body, section](bool checked) {
header->setArrowType(checked ? Qt::DownArrow : Qt::RightArrow);
header->setIcon(styling::icon(checked ? styling::Icon::CaretDown : styling::Icon::CaretRight));
body->setVisible(checked);
body->updateGeometry();
section->updateGeometry();
Expand Down
6 changes: 4 additions & 2 deletions editor/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "editor/debug.h"
#include "editor/application/toolchainInstaller.h"
#include "editor/styling/icons.h"
#include "editor/styling/workbench.h"
#include "editor/views/editorWindow.h"
#include "editor/views/projectBrowser.h"
#include "editor/views/splashScreen.h"
Expand All @@ -51,10 +52,10 @@ int main(int argc, char **argv) {
#ifndef Q_OS_MACOS
#ifdef ATLAS_DEBUG_BUILD
app.setWindowIcon(
QIcon(":/editor/assets/Icon-iOS-Default-1024x1024@1x.png"));
QIcon(":/editor/assets/atlas-app-dev.png"));
#else
app.setWindowIcon(
QIcon(":/editor/assets/iconFile-iOS-Dark-1024x1024@1x.png"));
QIcon(":/editor/assets/atlas-app.png"));
#endif
#endif

Expand All @@ -64,6 +65,7 @@ int main(int argc, char **argv) {

app.setStyle("Fusion");
styling::applyTheme(app);
styling::installWorkbench(app);
ToolchainInstaller::ensureInstalled();

auto *startupSplash = new SplashScreen();
Expand Down
Loading
Loading