jgrogan/stuff-from-scratch
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add Windows support.

Browse source
This commit is contained in:
david 2020-07-04 19:43:08 +01:00
parent ee51f3ee09
commit 683ba5447f
37 changed files with 477 additions and 113 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/client/CMakeLists.txt
View file

@ -1,3 +1,16 @@
list(APPEND client_HEADERS
TopBar.h
StatusBar.h
GuiApplication.h
TabbedPanelWidget.h
text_editor/TextEditorView.h
text_editor/TextEditorModel.h
text_editor/TextEditorController.h
text_editor/PlainTextDocument.h
audio_editor/AudioEditorView.h
image_editor/ImageEditorView.h
web_client/WebClientView.h)
list(APPEND client_LIB_INCLUDES
TopBar.cpp
StatusBar.cpp
@ -11,7 +24,7 @@ list(APPEND client_LIB_INCLUDES
image_editor/ImageEditorView.cpp
web_client/WebClientView.cpp)
add_library(client SHARED ${client_LIB_INCLUDES})
add_library(client SHARED ${client_LIB_INCLUDES} ${client_HEADERS})
target_link_libraries(client ui_elements windows core console database geometry)
@ -23,4 +36,6 @@ target_include_directories(client PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/web_client"
"${PROJECT_SOURCE_DIR}/src/console"
"${PROJECT_SOURCE_DIR}/src/ui_elements/widgets"
)
)
set_property(TARGET client PROPERTY FOLDER src)
set_target_properties( client PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON )

33
src/client/GuiApplication.cpp
View file

@ -1,12 +1,11 @@
#include "GuiApplication.h"
#include "Widget.h"
#include "XcbInterface.h"
#include "XcbKeyboard.h"
//#include "XcbInterface.h"
//#include "XcbKeyboard.h"
#include "Window.h"
#include "TextElement.h"
#include "WindowManager.h"
#include <iostream>
#include "TextEditorView.h"
#include "AudioEditorView.h"
#include "ImageEditorView.h"
@ -16,6 +15,8 @@
#include "StatusBar.h"
#include "HorizontalSpacer.h"
#include <iostream>
GuiApplication::GuiApplication()
: AbstractDesktopApp(),
mMainApplication(),
@ -74,18 +75,18 @@ void GuiApplication::Run()
auto mainWindow = mDesktopManager->GetWindowManager()->GetMainWindow();
SetUpWidget();
mDesktopManager->SetKeyboard(XcbKeyboard::Create());
//mDesktopManager->SetKeyboard(XcbKeyboard::Create());
bool useOpenGl = false;
XcbInterface window_interface;
window_interface.SetUseOpenGl(useOpenGl);
window_interface.Initialize();
window_interface.AddWindow(mainWindow);
window_interface.ShowWindow(mainWindow);
if(useOpenGl)
{
window_interface.CreateOpenGlDrawable(mainWindow);
}
window_interface.Loop(mDesktopManager.get());
window_interface.ShutDown();
//bool useOpenGl = false;
//XcbInterface window_interface;
//window_interface.SetUseOpenGl(useOpenGl);
//window_interface.Initialize();
//window_interface.AddWindow(mainWindow);
//window_interface.ShowWindow(mainWindow);
//if(useOpenGl)
//{
// window_interface.CreateOpenGlDrawable(mainWindow);
//}
//window_interface.Loop(mDesktopManager.get());
//window_interface.ShutDown();
}

4
src/client/GuiApplication.h
View file

@ -1,11 +1,11 @@
#pragma once
#include <memory>
#include "MainApplication.h"
#include "AbstractDesktopApp.h"
#include "DesktopManager.h"
#include <memory>
class GuiApplication : public AbstractDesktopApp
{