adam/flenser
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'widget-rewrite-1' into master

Browse Source 
* widget-rewrite-1:
  Now it's done.
  Partially done.
  Local RAII
  Requested anchor RAIIed.
  Image owns its alt text.
  Some const correctness in the Java pseudo core.
  Local ownership for font name.
  Fix building with no libjpeg.
This commit is contained in:
ADAM David Alan Martin
2025-08-21 23:38:12 -04:00
parent 24ec94e5b4 d035bd4427
commit f6841f59e0
21 changed files with 92 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/jpeg.cc
View File

@ -422,8 +422,8 @@ static void Jpeg_write(DilloJpeg *jpeg, void *Buf, uint_t BufSize)
#else /* ENABLE_JPEG */
void *a_Jpeg_new() { return 0; }
void a_Jpeg_callback() { return; }
void *a_Jpeg_new(DilloImage *, DilloUrl *, int) { return 0; }
void a_Jpeg_callback(int, void *) { return; }
const char *a_Jpeg_version(void) { return 0; }
#endif /* ENABLE_JPEG */

6
src/ui.cc
View File

@ -984,7 +984,7 @@ void UI::customize()
*/
void UI::change_panel(int new_size, int small_icons)
{
char *loc_text = dStrdup(Location->value());
std::string loc_text = Location->value();
// Remove current panel's bars
init_sizes();
@ -1004,10 +1004,8 @@ void UI::change_panel(int new_size, int small_icons)
a_UIcmd_set_buttons_sens(a_UIcmd_get_bw_by_widget(this));
TopGroup->rearrange();
Location->value(loc_text);
Location->value(loc_text.c_str());
Location->take_focus();
dFree(loc_text);
}
/**