nullworks/cathook
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
TotallyNotElite 2019-05-24 23:35:33 +02:00
commit 4538111f56
20 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/interfaces.cpp
View File

@ -181,6 +181,7 @@ void CreateInterfaces()
"43 04 85 C0 74 10") +
9);
}
#endif
logging::Info("Finding HUD");
IF_GAME(IsCSS())
{
@ -197,5 +198,4 @@ void CreateInterfaces()
g_CHUD = *reinterpret_cast<CHud **>(hud_sig);
logging::Info("HUD 0x%08x 0x%08x", hud_sig, g_CHUD);
}
#endif
}

8
src/visual/menu/menu/objects/TabButton.cpp
View File

@ -4,10 +4,10 @@
#include <menu/object/TabButton.hpp>
static settings::RVariable<rgba_t> color_selected{ "zk.style.tab-button.color.selected.background", "079797" };
static settings::RVariable<rgba_t> color_separator{ "zk.style.tab-button.color.separator", "079797" };
static settings::RVariable<rgba_t> color_hover_underline{ "zk.style.tab-button.color.hover.underline", "079797" };
static settings::RVariable<rgba_t> color_selected_underline{ "zk.style.tab-button.color.selected.underline", "079797" };
static settings::RVariable<rgba_t> color_selected{ "zk.style.tab-button.color.selected.background", "446498ff" };
static settings::RVariable<rgba_t> color_separator{ "zk.style.tab-button.color.separator", "446498ff" };
static settings::RVariable<rgba_t> color_hover_underline{ "zk.style.tab-button.color.hover.underline", "446498ff" };
static settings::RVariable<rgba_t> color_selected_underline{ "zk.style.tab-button.color.selected.underline", "446498ff" };
static settings::RVariable<rgba_t> color_text_selected{ "zk.style.tab-button.color.text.selected", "ffffff" };
static settings::RVariable<rgba_t> color_text{ "zk.style.tab-button.color.text.inactive", "cccccc" };

2
src/visual/menu/menu/objects/Tooltip.cpp
View File

@ -7,7 +7,7 @@
#include <menu/Menu.hpp>
static settings::RVariable<rgba_t> color_background{ "zk.style.tooltip.background", "00000055" };
static settings::RVariable<rgba_t> color_border{ "zk.style.tooltip.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.tooltip.border", "446498ff" };
namespace zerokernel
{

2
src/visual/menu/menu/objects/container/Box.cpp
View File

@ -10,7 +10,7 @@
#include <menu/Menu.hpp>
static settings::RVariable<rgba_t> color_border{ "zk.style.box.color.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.box.color.border", "446498ff" };
void zerokernel::Box::render()
{

2
src/visual/menu/menu/objects/container/ModalColorSelect.cpp
View File

@ -4,7 +4,7 @@
#include <menu/object/container/ModalColorSelect.hpp>
static settings::RVariable<rgba_t> color_border{ "zk.style.color-preview.color.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.color-preview.color.border", "446498ff" };
namespace zerokernel
{

2
src/visual/menu/menu/objects/container/ModalContainer.cpp
View File

@ -9,7 +9,7 @@
Created on 26.07.18.
*/
static settings::RVariable<rgba_t> color_border{ "zk.style.modal-container.color.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.modal-container.color.border", "446498ff" };
static settings::RVariable<rgba_t> color_background{ "zk.style.modal-container.color.background", "1d2f40" };
bool zerokernel::ModalContainer::handleSdlEvent(SDL_Event *event)

2
src/visual/menu/menu/objects/container/TabSelection.cpp
View File

@ -5,7 +5,7 @@
#include <menu/object/container/TabSelection.hpp>
#include <menu/object/TabButton.hpp>
static settings::RVariable<rgba_t> color_border{ "zk.style.tab-selection.color.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.tab-selection.color.border", "446498ff" };
namespace zerokernel
{

2
src/visual/menu/menu/objects/container/Table.cpp
View File

@ -5,7 +5,7 @@
#include <menu/object/container/Table.hpp>
#include <menu/Menu.hpp>
static settings::RVariable<rgba_t> color_border{ "zk.style.table.color.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.table.color.border", "446498ff" };
void zerokernel::Table::render()
{

6
src/visual/menu/menu/objects/input/Checkbox.cpp
View File

@ -6,9 +6,9 @@
#include <menu/menu/special/SettingsManagerList.hpp>
static settings::RVariable<int> checkbox_size{ "zk.style.checkbox.size", "12" };
static settings::RVariable<rgba_t> color_border{ "zk.style.checkbox.color.border", "079797" };
static settings::RVariable<rgba_t> color_checked{ "zk.style.checkbox.color.checked", "079797" };
static settings::RVariable<rgba_t> color_hover{ "zk.style.checkbox.color.hover", "07979777" };
static settings::RVariable<rgba_t> color_border{ "zk.style.checkbox.color.border", "446498ff" };
static settings::RVariable<rgba_t> color_checked{ "zk.style.checkbox.color.checked", "446498ff" };
static settings::RVariable<rgba_t> color_hover{ "zk.style.checkbox.color.hover", "446498ff77" };
bool zerokernel::Checkbox::onLeftMouseClick()
{

2
src/visual/menu/menu/objects/input/ColorSelector.cpp
View File

@ -10,7 +10,7 @@
static settings::RVariable<int> default_width{ "zk.style.input.color.width", "36" };
static settings::RVariable<int> default_height{ "zk.style.input.color.height", "14" };
static settings::RVariable<rgba_t> border{ "zk.style.input.color.border", "079797" };
static settings::RVariable<rgba_t> border{ "zk.style.input.color.border", "446498ff" };
namespace zerokernel
{

2
src/visual/menu/menu/objects/input/InputKey.cpp
View File

@ -7,7 +7,7 @@
static settings::RVariable<int> default_width{ "zk.style.input.key.width", "60" };
static settings::RVariable<int> default_height{ "zk.style.input.key.height", "14" };
static settings::RVariable<rgba_t> color_border{ "zk.style.input.key.color.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.input.key.color.border", "446498ff" };
static settings::RVariable<rgba_t> color_background_capturing{ "zk.style.input.key.color.background.capturing", "38b28f88" };
zerokernel::InputKey::InputKey() : BaseMenuObject{}

2
src/visual/menu/menu/objects/input/Select.cpp
View File

@ -7,7 +7,7 @@
#include <menu/Debug.hpp>
#include <menu/menu/special/SettingsManagerList.hpp>
static settings::RVariable<rgba_t> color_border{ "zk.style.input.select.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.input.select.border", "446498ff" };
static settings::RVariable<int> default_width{ "zk.style.input.select.width", "60" };
static settings::RVariable<int> default_height{ "zk.style.input.select.height", "14" };

4
src/visual/menu/menu/objects/input/Slider.cpp
View File

@ -15,6 +15,6 @@ settings::RVariable<int> SliderStyle::handle_width{ "zk.style.input.slider.handl
settings::RVariable<int> SliderStyle::bar_width{ "zk.style.input.slider.bar_width", "2" };
settings::RVariable<rgba_t> SliderStyle::handle_body{ "zk.style.input.slider.color.handle_body", "1d2f40" };
settings::RVariable<rgba_t> SliderStyle::handle_border{ "zk.style.input.slider.color.handle_border", "079797" };
settings::RVariable<rgba_t> SliderStyle::bar_color{ "zk.style.input.slider.color.bar", "079797" };
settings::RVariable<rgba_t> SliderStyle::handle_border{ "zk.style.input.slider.color.handle_border", "446498ff" };
settings::RVariable<rgba_t> SliderStyle::bar_color{ "zk.style.input.slider.color.bar", "446498ff" };
} // namespace zerokernel

4
src/visual/menu/menu/objects/input/TextInput.cpp
View File

@ -4,8 +4,8 @@
#include <menu/object/input/TextInput.hpp>
static settings::RVariable<rgba_t> color_border_active{ "zk.style.input.text.color.border.active", "38b28f" };
static settings::RVariable<rgba_t> color_border{ "zk.style.input.text.color.border.inactive", "079797" };
static settings::RVariable<rgba_t> color_border_active{ "zk.style.input.text.color.border.active", "42BC99ff" };
static settings::RVariable<rgba_t> color_border{ "zk.style.input.text.color.border.inactive", "446498ff" };
static settings::RVariable<rgba_t> color_text_active{ "zk.style.input.text.color.text.active", "ffffff" };
static settings::RVariable<rgba_t> color_text{ "zk.style.input.text.color.text.inactive", "aaaaaa" };

2
src/visual/menu/menu/special/TreeListBaseEntry.cpp
View File

@ -10,7 +10,7 @@
*/
static settings::RVariable<rgba_t> background_hover{ "zk.style.tree-list-entry.color.hover", "38b28f66" };
static settings::RVariable<rgba_t> lines{ "zk.style.tree-list-entry.color.lines", "38b28f" };
static settings::RVariable<rgba_t> lines{ "zk.style.tree-list-entry.color.lines", "42BC99ff" };
bool zerokernel::TreeListBaseEntry::handleSdlEvent(SDL_Event *event)
{

4
src/visual/menu/menu/wm/Task.cpp
View File

@ -12,8 +12,8 @@ static settings::RVariable<rgba_t> color_closed{ "zk.style.task.color.text.close
static settings::RVariable<rgba_t> color_focused{ "zk.style.task.color.text.focused", "ffffff" };
static settings::RVariable<rgba_t> color_open{ "zk.style.task.color.text.open", "cccccc" };
static settings::RVariable<rgba_t> color_hovered{ "zk.style.task.color.background.hover", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.task.color.border", "079797" };
static settings::RVariable<rgba_t> color_hovered{ "zk.style.task.color.background.hover", "446498ff" };
static settings::RVariable<rgba_t> color_border{ "zk.style.task.color.border", "446498ff" };
void zerokernel::Task::render()
{

2
src/visual/menu/menu/wm/TaskBar.cpp
View File

@ -8,7 +8,7 @@
#include <menu/Menu.hpp>
static settings::RVariable<rgba_t> color_background{ "zk.style.taskbar.color.background", "1d2f40" };
static settings::RVariable<rgba_t> color_border{ "zk.style.taskbar.color.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.taskbar.color.border", "446498ff" };
void zerokernel::TaskBar::reorderElements()
{

2
src/visual/menu/menu/wm/WMWindow.cpp
View File

@ -11,7 +11,7 @@
#include <menu/object/input/Select.hpp>
#include <menu/object/input/Checkbox.hpp>
static settings::RVariable<rgba_t> color_border{ "zk.style.window.color.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.window.color.border", "446498ff" };
static settings::RVariable<rgba_t> color_background{ "zk.style.window.color.background.active", "1d2f40" };
static settings::RVariable<rgba_t> color_background_inactive{ "zk.style.window.color.background.inactive", "1d2f4088" };

2
src/visual/menu/menu/wm/WindowCloseButton.cpp
View File

@ -11,7 +11,7 @@
static draw::Texture cross{ DATA_PATH "/menu/cross.png" };
static settings::RVariable<rgba_t> background_hover{ "zk.style.window-close-button.color.background-hover", "ff0000" };
static settings::RVariable<rgba_t> color_border{ "zk.style.window-close-button.color.border", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.window-close-button.color.border", "446498ff" };
void zerokernel::WindowCloseButton::render()
{

6
src/visual/menu/menu/wm/WindowHeader.cpp
View File

@ -9,9 +9,9 @@
*/
static settings::RVariable<rgba_t> color_background{ "zk.style.window-header.color.background.inactive", "00000000" };
static settings::RVariable<rgba_t> color_background_focused{ "zk.style.window-header.color.background.active", "079797" };
static settings::RVariable<rgba_t> color_border{ "zk.style.window-header.color.border.inactive", "079797" };
static settings::RVariable<rgba_t> color_border_focused{ "zk.style.window-header.color.border.active", "079797" };
static settings::RVariable<rgba_t> color_background_focused{ "zk.style.window-header.color.background.active", "446498ff" };
static settings::RVariable<rgba_t> color_border{ "zk.style.window-header.color.border.inactive", "446498ff" };
static settings::RVariable<rgba_t> color_border_focused{ "zk.style.window-header.color.border.active", "446498ff" };
zerokernel::WindowHeader::WindowHeader(WMWindow &window) : BaseMenuObject(), window(window), close()
{