Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-08-18 06:55:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Pump version plus a couple of minor nits.

Browse Source
This commit is contained in:
Martín Lucas Golini
2023-10-02 19:35:50 -03:00
parent 62451f6fa2
commit b83bcfd697
5 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/eepp/version.hpp
View File

@@ -5,9 +5,9 @@
#include <string> #include <string>
#define EEPP_MAJOR_VERSION 2 #define EEPP_MAJOR_VERSION 2
#define EEPP_MINOR_VERSION 6 #define EEPP_MINOR_VERSION 7
#define EEPP_PATCH_LEVEL 1 #define EEPP_PATCH_LEVEL 0
#define EEPP_CODENAME "Anathapindika" #define EEPP_CODENAME "Kāla"
/** The compiled version of the library */ /** The compiled version of the library */
#define EEPP_VERSION( x ) \ #define EEPP_VERSION( x ) \

6
src/eepp/system/lua-str.cpp
View File

@@ -239,8 +239,10 @@ static const char* min_expand( MatchState* ms, const char* s, const char* p, con
static const char* start_capture( MatchState* ms, const char* s, const char* p, int what ) { static const char* start_capture( MatchState* ms, const char* s, const char* p, int what ) {
const char* res; const char* res;
int level = ms->level; int level = ms->level;
if ( level >= LUA_MAXCAPTURES ) if ( level >= LUA_MAXCAPTURES ) {
throw_error( "too many captures" ); throw_error( "too many captures" );
return NULL;
}
ms->capture[level].init = s; ms->capture[level].init = s;
ms->capture[level].len = what; ms->capture[level].len = what;
ms->level = level + 1; ms->level = level + 1;
@@ -262,7 +264,7 @@ static const char* match_capture( MatchState* ms, const char* s, int l ) {
size_t len; size_t len;
l = check_capture( ms, l ); l = check_capture( ms, l );
len = ms->capture[l].len; len = ms->capture[l].len;
if ( ( size_t )( ms->src_end - s ) >= len && memcmp( ms->capture[l].init, s, len ) == 0 ) if ( (size_t)( ms->src_end - s ) >= len && memcmp( ms->capture[l].init, s, len ) == 0 )
return s + len; return s + len;
else else
return NULL; return NULL;

6
src/tools/ecode/applayout.xml.hpp
View File

@@ -68,10 +68,12 @@ StatusBar > #doc_info {
#search_replace.error { #search_replace.error {
border-color: #ff4040; border-color: #ff4040;
} }
TableView#locate_bar_table > tableview::row > tableview::cell:nth-child(2) { TableView#locate_bar_table > tableview::row > tableview::cell:nth-child(2),
TableView#locate_bar_table > tableview::row > tableview::cell:nth-child(3) {
color: var(--font-hint); color: var(--font-hint);
} }
TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child(2) { TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child(2),
TableView#locate_bar_table > tableview::row:selected > tableview::cell:nth-child(3) {
color: var(--font); color: var(--font);
} }
.search_tree treeview::cell { .search_tree treeview::cell {

7
src/tools/ecode/universallocator.cpp
View File

@@ -414,7 +414,12 @@ void UniversalLocator::updateLocateBarSync() {
mLocateTable->setPixelsSize( width, mLocateTable->setPixelsSize( width,
mLocateTable->getRowHeight() * LOCATEBAR_MAX_VISIBLE_ITEMS ); mLocateTable->getRowHeight() * LOCATEBAR_MAX_VISIBLE_ITEMS );
width -= mLocateTable->getVerticalScrollBar()->getPixelsSize().getWidth(); width -= mLocateTable->getVerticalScrollBar()->getPixelsSize().getWidth();
if ( mLocateTable->getModel() && mLocateTable->getModel()->columnCount() >= 2 ) { if ( mLocateTable->getModel() && mLocateTable->getModel()->columnCount() >= 3 ) {
mLocateTable->setColumnsVisible( { 0, 1, 2 } );
mLocateTable->setColumnWidth( 0, eefloor( width * 0.5 ) );
mLocateTable->setColumnWidth( 1, eefloor( width * 0.25 ) );
mLocateTable->setColumnWidth( 2, eefloor( width * 0.25 ) );
} else if ( mLocateTable->getModel() && mLocateTable->getModel()->columnCount() >= 2 ) {
mLocateTable->setColumnsVisible( { 0, 1 } ); mLocateTable->setColumnsVisible( { 0, 1 } );
mLocateTable->setColumnWidth( 0, eeceil( width * 0.5 ) ); mLocateTable->setColumnWidth( 0, eeceil( width * 0.5 ) );
mLocateTable->setColumnWidth( 1, width - mLocateTable->getColumnWidth( 0 ) ); mLocateTable->setColumnWidth( 1, width - mLocateTable->getColumnWidth( 0 ) );

6
src/tools/ecode/version.hpp
View File

@@ -7,9 +7,9 @@
using namespace EE; using namespace EE;
#define ECODE_MAJOR_VERSION 0 #define ECODE_MAJOR_VERSION 0
#define ECODE_MINOR_VERSION 4 #define ECODE_MINOR_VERSION 5
#define ECODE_PATCH_LEVEL 9 #define ECODE_PATCH_LEVEL 0
#define ECODE_CODENAME "Vajra" #define ECODE_CODENAME "Ākāśa"
/** The compiled version of the library */ /** The compiled version of the library */
#define ECODE_VERSION( x ) \ #define ECODE_VERSION( x ) \